@@ -46,20 +46,22 @@ and ident_string = ident_create "string"
4646and ident_extension_constructor = ident_create " extension_constructor"
4747and ident_floatarray = ident_create " floatarray"
4848
49+ and ident_unknown = ident_create " unknown"
50+
4951type test =
5052 | For_sure_yes
5153 | For_sure_no
5254 | NA
5355
5456let type_is_builtin_path_but_option (p : Path.t ) : test =
5557 match p with
56- | Pident {Ident. stamp} ->
58+ | Pident {stamp} ->
5759 if
58- stamp > = ident_int.Ident. stamp
59- && stamp < = ident_floatarray.Ident. stamp
60+ stamp > = ident_int.stamp
61+ && stamp < = ident_floatarray.stamp
6062 then
61- if (stamp = ident_option.Ident. stamp)
62- || (stamp = ident_unit.Ident. stamp) then
63+ if (stamp = ident_option.stamp)
64+ || (stamp = ident_unit.stamp) then
6365 For_sure_no
6466 else For_sure_yes
6567 else NA
@@ -80,6 +82,8 @@ and path_option = Pident ident_option
8082and path_int64 = Pident ident_int64
8183and path_lazy_t = Pident ident_lazy_t
8284and path_string = Pident ident_string
85+
86+ and path_unkonwn = Pident ident_unknown
8387and path_extension_constructor = Pident ident_extension_constructor
8488and path_floatarray = Pident ident_floatarray
8589
@@ -98,35 +102,36 @@ and type_option t = newgenty (Tconstr(path_option, [t], ref Mnil))
98102and type_int64 = newgenty (Tconstr (path_int64, [] , ref Mnil ))
99103and type_lazy_t t = newgenty (Tconstr (path_lazy_t, [t], ref Mnil ))
100104and type_string = newgenty (Tconstr (path_string, [] , ref Mnil ))
105+
106+ and type_unknown = newgenty (Tconstr (path_unkonwn, [] , ref Mnil ))
101107and type_extension_constructor =
102108 newgenty (Tconstr (path_extension_constructor, [] , ref Mnil ))
103109and type_floatarray = newgenty (Tconstr (path_floatarray, [] , ref Mnil ))
104110
105111let ident_match_failure = ident_create_predef_exn " Match_failure"
106- and ident_out_of_memory = ident_create_predef_exn " Out_of_memory "
112+
107113and ident_invalid_argument = ident_create_predef_exn " Invalid_argument"
108114and ident_failure = ident_create_predef_exn " Failure"
115+
116+ and ident_js_error = ident_create_predef_exn " JsError"
109117and ident_not_found = ident_create_predef_exn " Not_found"
110- and ident_sys_error = ident_create_predef_exn " Sys_error "
118+
111119and ident_end_of_file = ident_create_predef_exn " End_of_file"
112120and ident_division_by_zero = ident_create_predef_exn " Division_by_zero"
113- and ident_stack_overflow = ident_create_predef_exn " Stack_overflow "
114- and ident_sys_blocked_io = ident_create_predef_exn " Sys_blocked_io "
121+
122+
115123and ident_assert_failure = ident_create_predef_exn " Assert_failure"
116124and ident_undefined_recursive_module =
117125 ident_create_predef_exn " Undefined_recursive_module"
118126
119127let all_predef_exns = [
120128 ident_match_failure;
121- ident_out_of_memory;
122129 ident_invalid_argument;
123130 ident_failure;
131+ ident_js_error;
124132 ident_not_found;
125- ident_sys_error;
126133 ident_end_of_file;
127134 ident_division_by_zero;
128- ident_stack_overflow;
129- ident_sys_blocked_io;
130135 ident_assert_failure;
131136 ident_undefined_recursive_module;
132137]
@@ -167,6 +172,8 @@ and ident_nil = ident_create "[]"
167172and ident_cons = ident_create " ::"
168173and ident_none = ident_create " None"
169174and ident_some = ident_create " Some"
175+
176+ and ident_ctor_unknown = ident_create " Unknown"
170177let common_initial_env add_type add_extension empty_env =
171178 let decl_bool =
172179 {decl_abstr with
@@ -200,6 +207,20 @@ let common_initial_env add_type add_extension empty_env =
200207 type_arity = 1 ;
201208 type_kind = Type_variant ([cstr ident_none []; cstr ident_some [tvar]]);
202209 type_variance = [Variance. covariant]}
210+ and decl_unknown =
211+ let tvar = newgenvar () in
212+ {decl_abstr with
213+ type_params = [] ;
214+ type_arity = 0 ;
215+ type_kind = Type_variant ([ {
216+ cd_id = ident_ctor_unknown;
217+ cd_args = Cstr_tuple [tvar];
218+ cd_res = Some type_unknown;
219+ cd_loc = Location. none;
220+ cd_attributes = []
221+ }]);
222+ type_unboxed = Types. unboxed_true_default_false
223+ }
203224 and decl_lazy_t =
204225 let tvar = newgenvar() in
205226 {decl_abstr with
@@ -222,13 +243,10 @@ let common_initial_env add_type add_extension empty_env =
222243 in
223244 add_extension ident_match_failure
224245 [newgenty (Ttuple [type_string; type_int; type_int])] (
225- add_extension ident_out_of_memory [] (
226- add_extension ident_stack_overflow [] (
227246 add_extension ident_invalid_argument [type_string] (
247+ add_extension ident_js_error [type_unknown] (
228248 add_extension ident_failure [type_string] (
229249 add_extension ident_not_found [] (
230- add_extension ident_sys_blocked_io [] (
231- add_extension ident_sys_error [type_string] (
232250 add_extension ident_end_of_file [] (
233251 add_extension ident_division_by_zero [] (
234252 add_extension ident_assert_failure
@@ -245,11 +263,12 @@ let common_initial_env add_type add_extension empty_env =
245263 add_type ident_unit decl_unit (
246264 add_type ident_bool decl_bool (
247265 add_type ident_float decl_abstr (
266+ add_type ident_unknown decl_unknown(
248267 add_type ident_string decl_abstr (
249268 add_type ident_int decl_abstr_imm (
250269 add_type ident_extension_constructor decl_abstr (
251270 add_type ident_floatarray decl_abstr (
252- empty_env)))))))))))))))))))))))))
271+ empty_env)))))))))))))))))))))))
253272
254273let build_initial_env add_type add_exception empty_env =
255274 let common = common_initial_env add_type add_exception empty_env in
@@ -263,10 +282,10 @@ let build_initial_env add_type add_exception empty_env =
263282
264283let builtin_values =
265284 List. map (fun id -> Ident. make_global id; (Ident. name id, id))
266- [ident_match_failure; ident_out_of_memory; ident_stack_overflow;
285+ [ident_match_failure;
267286 ident_invalid_argument;
268- ident_failure; ident_not_found; ident_sys_error; ident_end_of_file;
269- ident_division_by_zero; ident_sys_blocked_io;
287+ ident_failure; ident_js_error; ident_not_found; ident_end_of_file;
288+ ident_division_by_zero;
270289 ident_assert_failure; ident_undefined_recursive_module ]
271290
272291(* Start non-predef identifiers at 1000. This way, more predefs can
0 commit comments