Fix Gentype for real

Author: cknitt

compiler/gentype/TranslateTypeExprFromTypes.ml

@@ -81,40 +81,42 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
   | ( ( ["FB"; "string"]
       | ["string"]
       | ["String"; "t"]
-      | ["Stdlib_String"; "t"]
+      | ["Stdlib"; "String"; "t"]
       | ["Js"; ("String" | "String2"); "t"] ),
       [] ) ->
     {dependencies = []; type_ = string_t}
-  | ( (["Js"; "Types"; "bigint_val"] | ["BigInt"; "t"] | ["Stdlib_BigInt"; "t"]),
+  | ( ( ["Js"; "Types"; "bigint_val"]
+      | ["BigInt"; "t"]
+      | ["Stdlib"; "BigInt"; "t"] ),
       [] ) ->
     {dependencies = []; type_ = bigint_t}
-  | (["Js"; "Date"; "t"] | ["Date"; "t"] | ["Stdlib_Date"; "t"]), [] ->
+  | (["Js"; "Date"; "t"] | ["Date"; "t"] | ["Stdlib"; "Date"; "t"]), [] ->
     {dependencies = []; type_ = date_t}
-  | ( (["Map"; "t"] | ["Stdlib_Map"; "t"]),
+  | ( (["Map"; "t"] | ["Stdlib"; "Map"; "t"]),
       [param_translation1; param_translation2] ) ->
     {
       dependencies =
         param_translation1.dependencies @ param_translation2.dependencies;
       type_ = map_t (param_translation1.type_, param_translation2.type_);
     }
-  | ( (["WeakMap"; "t"] | ["Stdlib_WeakMap"; "t"]),
+  | ( (["WeakMap"; "t"] | ["Stdlib"; "WeakMap"; "t"]),
       [param_translation1; param_translation2] ) ->
     {
       dependencies =
         param_translation1.dependencies @ param_translation2.dependencies;
       type_ = weakmap_t (param_translation1.type_, param_translation2.type_);
     }
-  | (["Set"; "t"] | ["Stdlib_Set"; "t"]), [param_translation] ->
+  | (["Set"; "t"] | ["Stdlib"; "Set"; "t"]), [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = set_t param_translation.type_;
     }
-  | (["WeakSet"; "t"] | ["Stdlib_WeakSet"; "t"]), [param_translation] ->
+  | (["WeakSet"; "t"] | ["Stdlib"; "WeakSet"; "t"]), [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = weakset_t param_translation.type_;
     }
-  | (["Js"; "Re"; "t"] | ["RegExp"; "t"] | ["Stdlib_RegExp"; "t"]), [] ->
+  | (["Js"; "Re"; "t"] | ["RegExp"; "t"] | ["Stdlib"; "RegExp"; "t"]), [] ->
     {dependencies = []; type_ = regexp_t}
   | (["FB"; "unit"] | ["unit"]), [] -> {dependencies = []; type_ = unit_t}
   | ( (["FB"; "array"] | ["array"] | ["Js"; ("Array" | "Array2"); "t"]),
@@ -141,7 +143,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
   | ( ( ["Pervasives"; "result"]
       | ["Belt"; "Result"; "t"]
       | ["result"]
-      | ["Stdlib_Result"; "t"] ),
+      | ["Stdlib"; "Result"; "t"] ),
       [param_translation1; param_translation2] ) ->
     let case name type_ = {case = {label_js = StringLabel name}; t = type_} in
     let variant =
@@ -226,24 +228,24 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
   | ( ( ["Js"; "Null"; "t"]
       | ["Null"; "t"]
       | ["Js"; "null"]
-      | ["Stdlib_Null"; "t"] ),
+      | ["Stdlib"; "Null"; "t"] ),
       [param_translation] ) ->
     {param_translation with type_ = Null param_translation.type_}
   | ( ( ["Js"; "Nullable"; "t"]
       | ["Nullable"; "t"]
       | ["Js"; "nullable"]
       | ["Js"; "Null_undefined"; "t"]
       | ["Js"; "null_undefined"]
-      | ["Stdlib_Nullable"; "t"] ),
+      | ["Stdlib"; "Nullable"; "t"] ),
       [param_translation] ) ->
     {param_translation with type_ = Nullable param_translation.type_}
   | ( ( ["Js"; "Promise"; "t"]
       | ["Promise"; "t"]
       | ["promise"]
-      | ["Stdlib_Promise"; "t"] ),
+      | ["Stdlib"; "Promise"; "t"] ),
       [param_translation] ) ->
     {param_translation with type_ = Promise param_translation.type_}
-  | ( (["Js"; "Dict"; "t"] | ["Dict"; "t"] | ["dict"] | ["Stdlib_Dict"; "t"]),
+  | ( (["Js"; "Dict"; "t"] | ["Dict"; "t"] | ["dict"] | ["Stdlib"; "Dict"; "t"]),
       [param_translation] ) ->
     {param_translation with type_ = Dict param_translation.type_}
   | _ -> default_case ()