From f6b9b99a44d9bc1e90aaefdc5d13b2f44e99036a Mon Sep 17 00:00:00 2001 From: Alain Frisch Date: Mar 26 2014 18:00:16 +0000 Subject: Get rid of some uses of implicit removal of optional arguments. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14495 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- diff --git a/parsing/ast_helper.ml b/parsing/ast_helper.ml index 715715b..46696bc 100644 --- a/parsing/ast_helper.ml +++ b/parsing/ast_helper.ml @@ -374,7 +374,7 @@ module Convenience = struct let may_tuple tup = function | [] -> None | [x] -> Some x - | l -> Some (tup l) + | l -> Some (tup ?loc:None ?attrs:None l) let lid s = mkloc (Longident.parse s) !default_loc let tuple l = Exp.tuple l diff --git a/typing/predef.ml b/typing/predef.ml index d83c9cf..9b95d62 100644 --- a/typing/predef.ml +++ b/typing/predef.ml @@ -144,7 +144,7 @@ let build_initial_env add_type add_exception empty_env = Type_variant([cstr ident_nil []; cstr ident_cons [tvar; type_list tvar]]); type_variance = [Variance.covariant]} and decl_format6 = - let params = List.map newgenvar [();();();();();()] in + let params = List.map (newgenvar ?name:None) [();();();();();()] in {decl_abstr with type_params = params; type_arity = 6; diff --git a/typing/typemod.ml b/typing/typemod.ml index 0ee1c82..1e7a380 100644 --- a/typing/typemod.ml +++ b/typing/typemod.ml @@ -1483,7 +1483,7 @@ let () = Typecore.type_module := type_module; Typetexp.transl_modtype_longident := transl_modtype_longident; Typetexp.transl_modtype := transl_modtype; - Typecore.type_open := type_open; + Typecore.type_open := type_open ?toplevel:None; Typecore.type_package := type_package; type_module_type_of_fwd := type_module_type_of