diff options
21 files changed, 787 insertions, 763 deletions
@@ -64,6 +64,13 @@ Working version - #9582: Add Array.{find_opt,find_map,split,combine}. (Nicolás Ojeda Bär, review by Daniel Bünzli and Gabriel Scherer) +* #10169: Use capitalized module names in the Standard Library prefixing scheme + to match Dune, e.g. Stdlib__String instead of Stdlib__string. This is a + breaking change only to code which attempted to use the internal names before. + The Standard Library generated by the Dune rules is now equivalent to the main + build (the Dune rules still do not generate a distributable compiler). + (David Allsopp and Mark Shinwell, review by Gabriel Scherer) + ### Other libraries: * #10084: Unix.open_process_args* functions now look up the program in the PATH. @@ -70,6 +70,8 @@ TOPLEVELSTART=toplevel/topstart.cmo TOPLEVELINIT=toplevel/toploop.cmo +# This list is passed to expunge, which accepts both uncapitalized and +# capitalized module names. PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop LIBFILES=stdlib.cma std_exit.cmo *.cmi camlheader diff --git a/api_docgen/Makefile.docfiles b/api_docgen/Makefile.docfiles index d6dc10df29..e403da657a 100644 --- a/api_docgen/Makefile.docfiles +++ b/api_docgen/Makefile.docfiles @@ -34,11 +34,8 @@ thread_MLIS := \ thread.mli event.mli \ threadUnix.mli -STDLIB=$(filter-out stdlib__pervasives, $(STDLIB_MODULES)) - -stdlib_UNPREFIXED=$(STDLIB:stdlib__%=%) libref= \ - $(stdlib_UNPREFIXED) \ + $(filter-out pervasives,$(STDLIB_MODULE_BASENAMES)) \ $(str_MLIS:%.mli=%) \ $(unix_MLIS:%.mli=%) \ $(dynlink_MLIS:%.mli=%) \ diff --git a/stdlib/.depend b/stdlib/.depend index e575e48ed6..e96ac71ccd 100644 --- a/stdlib/.depend +++ b/stdlib/.depend @@ -1,760 +1,760 @@ -stdlib__arg.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__printf.cmi \ - stdlib__list.cmi \ - stdlib__buffer.cmi \ - stdlib__array.cmi \ - stdlib__arg.cmi -stdlib__arg.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__printf.cmx \ - stdlib__list.cmx \ - stdlib__buffer.cmx \ - stdlib__array.cmx \ - stdlib__arg.cmi -stdlib__arg.cmi : -stdlib__array.cmo : \ - stdlib__seq.cmi \ - stdlib__array.cmi -stdlib__array.cmx : \ - stdlib__seq.cmx \ - stdlib__array.cmi -stdlib__array.cmi : \ - stdlib__seq.cmi -stdlib__arrayLabels.cmo : \ - stdlib__array.cmi \ - stdlib__arrayLabels.cmi -stdlib__arrayLabels.cmx : \ - stdlib__array.cmx \ - stdlib__arrayLabels.cmi -stdlib__arrayLabels.cmi : \ - stdlib__seq.cmi -stdlib__atomic.cmo : \ +stdlib__Arg.cmo : arg.ml \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Printf.cmi \ + stdlib__List.cmi \ + stdlib__Buffer.cmi \ + stdlib__Array.cmi \ + stdlib__Arg.cmi +stdlib__Arg.cmx : arg.ml \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Printf.cmx \ + stdlib__List.cmx \ + stdlib__Buffer.cmx \ + stdlib__Array.cmx \ + stdlib__Arg.cmi +stdlib__Arg.cmi : arg.mli +stdlib__Array.cmo : array.ml \ + stdlib__Seq.cmi \ + stdlib__Array.cmi +stdlib__Array.cmx : array.ml \ + stdlib__Seq.cmx \ + stdlib__Array.cmi +stdlib__Array.cmi : array.mli \ + stdlib__Seq.cmi +stdlib__ArrayLabels.cmo : arrayLabels.ml \ + stdlib__Array.cmi \ + stdlib__ArrayLabels.cmi +stdlib__ArrayLabels.cmx : arrayLabels.ml \ + stdlib__Array.cmx \ + stdlib__ArrayLabels.cmi +stdlib__ArrayLabels.cmi : arrayLabels.mli \ + stdlib__Seq.cmi +stdlib__Atomic.cmo : atomic.ml \ camlinternalAtomic.cmi \ - stdlib__atomic.cmi -stdlib__atomic.cmx : \ + stdlib__Atomic.cmi +stdlib__Atomic.cmx : atomic.ml \ camlinternalAtomic.cmx \ - stdlib__atomic.cmi -stdlib__atomic.cmi : -stdlib__bigarray.cmo : \ - stdlib__sys.cmi \ - stdlib__complex.cmi \ - stdlib__array.cmi \ - stdlib__bigarray.cmi -stdlib__bigarray.cmx : \ - stdlib__sys.cmx \ - stdlib__complex.cmx \ - stdlib__array.cmx \ - stdlib__bigarray.cmi -stdlib__bigarray.cmi : \ - stdlib__complex.cmi -stdlib__bool.cmo : \ + stdlib__Atomic.cmi +stdlib__Atomic.cmi : atomic.mli +stdlib__Bigarray.cmo : bigarray.ml \ + stdlib__Sys.cmi \ + stdlib__Complex.cmi \ + stdlib__Array.cmi \ + stdlib__Bigarray.cmi +stdlib__Bigarray.cmx : bigarray.ml \ + stdlib__Sys.cmx \ + stdlib__Complex.cmx \ + stdlib__Array.cmx \ + stdlib__Bigarray.cmi +stdlib__Bigarray.cmi : bigarray.mli \ + stdlib__Complex.cmi +stdlib__Bool.cmo : bool.ml \ stdlib.cmi \ - stdlib__bool.cmi -stdlib__bool.cmx : \ + stdlib__Bool.cmi +stdlib__Bool.cmx : bool.ml \ stdlib.cmx \ - stdlib__bool.cmi -stdlib__bool.cmi : -stdlib__buffer.cmo : \ - stdlib__uchar.cmi \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__seq.cmi \ - stdlib__char.cmi \ - stdlib__bytes.cmi \ - stdlib__buffer.cmi -stdlib__buffer.cmx : \ - stdlib__uchar.cmx \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__seq.cmx \ - stdlib__char.cmx \ - stdlib__bytes.cmx \ - stdlib__buffer.cmi -stdlib__buffer.cmi : \ - stdlib__uchar.cmi \ - stdlib__seq.cmi -stdlib__bytes.cmo : \ - stdlib__sys.cmi \ + stdlib__Bool.cmi +stdlib__Bool.cmi : bool.mli +stdlib__Buffer.cmo : buffer.ml \ + stdlib__Uchar.cmi \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Seq.cmi \ + stdlib__Char.cmi \ + stdlib__Bytes.cmi \ + stdlib__Buffer.cmi +stdlib__Buffer.cmx : buffer.ml \ + stdlib__Uchar.cmx \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Seq.cmx \ + stdlib__Char.cmx \ + stdlib__Bytes.cmx \ + stdlib__Buffer.cmi +stdlib__Buffer.cmi : buffer.mli \ + stdlib__Uchar.cmi \ + stdlib__Seq.cmi +stdlib__Bytes.cmo : bytes.ml \ + stdlib__Sys.cmi \ stdlib.cmi \ - stdlib__seq.cmi \ - stdlib__char.cmi \ - stdlib__bytes.cmi -stdlib__bytes.cmx : \ - stdlib__sys.cmx \ + stdlib__Seq.cmi \ + stdlib__Char.cmi \ + stdlib__Bytes.cmi +stdlib__Bytes.cmx : bytes.ml \ + stdlib__Sys.cmx \ stdlib.cmx \ - stdlib__seq.cmx \ - stdlib__char.cmx \ - stdlib__bytes.cmi -stdlib__bytes.cmi : \ - stdlib__seq.cmi -stdlib__bytesLabels.cmo : \ - stdlib__bytes.cmi \ - stdlib__bytesLabels.cmi -stdlib__bytesLabels.cmx : \ - stdlib__bytes.cmx \ - stdlib__bytesLabels.cmi -stdlib__bytesLabels.cmi : \ - stdlib__seq.cmi -stdlib__callback.cmo : \ - stdlib__obj.cmi \ - stdlib__callback.cmi -stdlib__callback.cmx : \ - stdlib__obj.cmx \ - stdlib__callback.cmi -stdlib__callback.cmi : + stdlib__Seq.cmx \ + stdlib__Char.cmx \ + stdlib__Bytes.cmi +stdlib__Bytes.cmi : bytes.mli \ + stdlib__Seq.cmi +stdlib__BytesLabels.cmo : bytesLabels.ml \ + stdlib__Bytes.cmi \ + stdlib__BytesLabels.cmi +stdlib__BytesLabels.cmx : bytesLabels.ml \ + stdlib__Bytes.cmx \ + stdlib__BytesLabels.cmi +stdlib__BytesLabels.cmi : bytesLabels.mli \ + stdlib__Seq.cmi +stdlib__Callback.cmo : callback.ml \ + stdlib__Obj.cmi \ + stdlib__Callback.cmi +stdlib__Callback.cmx : callback.ml \ + stdlib__Obj.cmx \ + stdlib__Callback.cmi +stdlib__Callback.cmi : callback.mli camlinternalAtomic.cmo : \ camlinternalAtomic.cmi camlinternalAtomic.cmx : \ camlinternalAtomic.cmi camlinternalAtomic.cmi : camlinternalFormat.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__int.cmi \ - stdlib__char.cmi \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Int.cmi \ + stdlib__Char.cmi \ camlinternalFormatBasics.cmi \ - stdlib__bytes.cmi \ - stdlib__buffer.cmi \ + stdlib__Bytes.cmi \ + stdlib__Buffer.cmi \ camlinternalFormat.cmi camlinternalFormat.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__int.cmx \ - stdlib__char.cmx \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Int.cmx \ + stdlib__Char.cmx \ camlinternalFormatBasics.cmx \ - stdlib__bytes.cmx \ - stdlib__buffer.cmx \ + stdlib__Bytes.cmx \ + stdlib__Buffer.cmx \ camlinternalFormat.cmi camlinternalFormat.cmi : \ camlinternalFormatBasics.cmi \ - stdlib__buffer.cmi + stdlib__Buffer.cmi camlinternalFormatBasics.cmo : \ camlinternalFormatBasics.cmi camlinternalFormatBasics.cmx : \ camlinternalFormatBasics.cmi camlinternalFormatBasics.cmi : camlinternalLazy.cmo : \ - stdlib__obj.cmi \ + stdlib__Obj.cmi \ camlinternalLazy.cmi camlinternalLazy.cmx : \ - stdlib__obj.cmx \ + stdlib__Obj.cmx \ camlinternalLazy.cmi camlinternalLazy.cmi : camlinternalMod.cmo : \ - stdlib__sys.cmi \ - stdlib__obj.cmi \ - stdlib__nativeint.cmi \ + stdlib__Sys.cmi \ + stdlib__Obj.cmi \ + stdlib__Nativeint.cmi \ camlinternalOO.cmi \ camlinternalLazy.cmi \ - stdlib__array.cmi \ + stdlib__Array.cmi \ camlinternalMod.cmi camlinternalMod.cmx : \ - stdlib__sys.cmx \ - stdlib__obj.cmx \ - stdlib__nativeint.cmx \ + stdlib__Sys.cmx \ + stdlib__Obj.cmx \ + stdlib__Nativeint.cmx \ camlinternalOO.cmx \ camlinternalLazy.cmx \ - stdlib__array.cmx \ + stdlib__Array.cmx \ camlinternalMod.cmi camlinternalMod.cmi : \ - stdlib__obj.cmi + stdlib__Obj.cmi camlinternalOO.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__obj.cmi \ - stdlib__map.cmi \ - stdlib__list.cmi \ - stdlib__char.cmi \ - stdlib__array.cmi \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Obj.cmi \ + stdlib__Map.cmi \ + stdlib__List.cmi \ + stdlib__Char.cmi \ + stdlib__Array.cmi \ camlinternalOO.cmi camlinternalOO.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__obj.cmx \ - stdlib__map.cmx \ - stdlib__list.cmx \ - stdlib__char.cmx \ - stdlib__array.cmx \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Obj.cmx \ + stdlib__Map.cmx \ + stdlib__List.cmx \ + stdlib__Char.cmx \ + stdlib__Array.cmx \ camlinternalOO.cmi camlinternalOO.cmi : \ - stdlib__obj.cmi -stdlib__char.cmo : \ - stdlib__char.cmi -stdlib__char.cmx : \ - stdlib__char.cmi -stdlib__char.cmi : -stdlib__complex.cmo : \ - stdlib__complex.cmi -stdlib__complex.cmx : \ - stdlib__complex.cmi -stdlib__complex.cmi : -stdlib__condition.cmo : \ - stdlib__mutex.cmi \ - stdlib__condition.cmi -stdlib__condition.cmx : \ - stdlib__mutex.cmx \ - stdlib__condition.cmi -stdlib__condition.cmi : \ - stdlib__mutex.cmi -stdlib__digest.cmo : \ - stdlib__string.cmi \ - stdlib__char.cmi \ - stdlib__bytes.cmi \ - stdlib__digest.cmi -stdlib__digest.cmx : \ - stdlib__string.cmx \ - stdlib__char.cmx \ - stdlib__bytes.cmx \ - stdlib__digest.cmi -stdlib__digest.cmi : -stdlib__domain.cmo : \ - stdlib__sys.cmi \ + stdlib__Obj.cmi +stdlib__Char.cmo : char.ml \ + stdlib__Char.cmi +stdlib__Char.cmx : char.ml \ + stdlib__Char.cmi +stdlib__Char.cmi : char.mli +stdlib__Complex.cmo : complex.ml \ + stdlib__Complex.cmi +stdlib__Complex.cmx : complex.ml \ + stdlib__Complex.cmi +stdlib__Complex.cmi : complex.mli +stdlib__Condition.cmo : condition.ml \ + stdlib__Mutex.cmi \ + stdlib__Condition.cmi +stdlib__Condition.cmx : condition.ml \ + stdlib__Mutex.cmx \ + stdlib__Condition.cmi +stdlib__Condition.cmi : condition.mli \ + stdlib__Mutex.cmi +stdlib__Digest.cmo : digest.ml \ + stdlib__String.cmi \ + stdlib__Char.cmi \ + stdlib__Bytes.cmi \ + stdlib__Digest.cmi +stdlib__Digest.cmx : digest.ml \ + stdlib__String.cmx \ + stdlib__Char.cmx \ + stdlib__Bytes.cmx \ + stdlib__Digest.cmi +stdlib__Digest.cmi : digest.mli +stdlib__Domain.cmo : domain.ml \ + stdlib__Sys.cmi \ stdlib.cmi \ - stdlib__obj.cmi \ - stdlib__mutex.cmi \ - stdlib__atomic.cmi \ - stdlib__array.cmi \ - stdlib__domain.cmi -stdlib__domain.cmx : \ - stdlib__sys.cmx \ + stdlib__Obj.cmi \ + stdlib__Mutex.cmi \ + stdlib__Atomic.cmi \ + stdlib__Array.cmi \ + stdlib__Domain.cmi +stdlib__Domain.cmx : domain.ml \ + stdlib__Sys.cmx \ stdlib.cmx \ - stdlib__obj.cmx \ - stdlib__mutex.cmx \ - stdlib__atomic.cmx \ - stdlib__array.cmx \ - stdlib__domain.cmi -stdlib__domain.cmi : -stdlib__either.cmo : \ - stdlib__either.cmi -stdlib__either.cmx : \ - stdlib__either.cmi -stdlib__either.cmi : -stdlib__ephemeron.cmo : \ - stdlib__sys.cmi \ - stdlib__seq.cmi \ - stdlib__random.cmi \ - stdlib__obj.cmi \ - stdlib__lazy.cmi \ - stdlib__hashtbl.cmi \ - stdlib__array.cmi \ - stdlib__ephemeron.cmi -stdlib__ephemeron.cmx : \ - stdlib__sys.cmx \ - stdlib__seq.cmx \ - stdlib__random.cmx \ - stdlib__obj.cmx \ - stdlib__lazy.cmx \ - stdlib__hashtbl.cmx \ - stdlib__array.cmx \ - stdlib__ephemeron.cmi -stdlib__ephemeron.cmi : \ - stdlib__hashtbl.cmi -stdlib__filename.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__random.cmi \ - stdlib__printf.cmi \ - stdlib__list.cmi \ - stdlib__domain.cmi \ - stdlib__buffer.cmi \ - stdlib__filename.cmi -stdlib__filename.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__random.cmx \ - stdlib__printf.cmx \ - stdlib__list.cmx \ - stdlib__domain.cmx \ - stdlib__buffer.cmx \ - stdlib__filename.cmi -stdlib__filename.cmi : -stdlib__float.cmo : \ + stdlib__Obj.cmx \ + stdlib__Mutex.cmx \ + stdlib__Atomic.cmx \ + stdlib__Array.cmx \ + stdlib__Domain.cmi +stdlib__Domain.cmi : domain.mli +stdlib__Either.cmo : either.ml \ + stdlib__Either.cmi +stdlib__Either.cmx : either.ml \ + stdlib__Either.cmi +stdlib__Either.cmi : either.mli +stdlib__Ephemeron.cmo : ephemeron.ml \ + stdlib__Sys.cmi \ + stdlib__Seq.cmi \ + stdlib__Random.cmi \ + stdlib__Obj.cmi \ + stdlib__Lazy.cmi \ + stdlib__Hashtbl.cmi \ + stdlib__Array.cmi \ + stdlib__Ephemeron.cmi +stdlib__Ephemeron.cmx : ephemeron.ml \ + stdlib__Sys.cmx \ + stdlib__Seq.cmx \ + stdlib__Random.cmx \ + stdlib__Obj.cmx \ + stdlib__Lazy.cmx \ + stdlib__Hashtbl.cmx \ + stdlib__Array.cmx \ + stdlib__Ephemeron.cmi +stdlib__Ephemeron.cmi : ephemeron.mli \ + stdlib__Hashtbl.cmi +stdlib__Filename.cmo : filename.ml \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Random.cmi \ + stdlib__Printf.cmi \ + stdlib__List.cmi \ + stdlib__Domain.cmi \ + stdlib__Buffer.cmi \ + stdlib__Filename.cmi +stdlib__Filename.cmx : filename.ml \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Random.cmx \ + stdlib__Printf.cmx \ + stdlib__List.cmx \ + stdlib__Domain.cmx \ + stdlib__Buffer.cmx \ + stdlib__Filename.cmi +stdlib__Filename.cmi: filename.mli +stdlib__Float.cmo : float.ml \ stdlib.cmi \ - stdlib__seq.cmi \ - stdlib__list.cmi \ - stdlib__array.cmi \ - stdlib__float.cmi -stdlib__float.cmx : \ + stdlib__Seq.cmi \ + stdlib__List.cmi \ + stdlib__Array.cmi \ + stdlib__Float.cmi +stdlib__Float.cmx : float.ml \ stdlib.cmx \ - stdlib__seq.cmx \ - stdlib__list.cmx \ - stdlib__array.cmx \ - stdlib__float.cmi -stdlib__float.cmi : \ + stdlib__Seq.cmx \ + stdlib__List.cmx \ + stdlib__Array.cmx \ + stdlib__Float.cmi +stdlib__Float.cmi : float.mli \ stdlib.cmi \ - stdlib__seq.cmi -stdlib__format.cmo : \ - stdlib__string.cmi \ + stdlib__Seq.cmi +stdlib__Format.cmo : format.ml \ + stdlib__String.cmi \ stdlib.cmi \ - stdlib__stack.cmi \ - stdlib__seq.cmi \ - stdlib__queue.cmi \ - stdlib__list.cmi \ - stdlib__int.cmi \ - stdlib__domain.cmi \ + stdlib__Stack.cmi \ + stdlib__Seq.cmi \ + stdlib__Queue.cmi \ + stdlib__List.cmi \ + stdlib__Int.cmi \ + stdlib__Domain.cmi \ camlinternalFormatBasics.cmi \ camlinternalFormat.cmi \ - stdlib__buffer.cmi \ - stdlib__format.cmi -stdlib__format.cmx : \ - stdlib__string.cmx \ + stdlib__Buffer.cmi \ + stdlib__Format.cmi +stdlib__Format.cmx : format.ml \ + stdlib__String.cmx \ stdlib.cmx \ - stdlib__stack.cmx \ - stdlib__seq.cmx \ - stdlib__queue.cmx \ - stdlib__list.cmx \ - stdlib__int.cmx \ - stdlib__domain.cmx \ + stdlib__Stack.cmx \ + stdlib__Seq.cmx \ + stdlib__Queue.cmx \ + stdlib__List.cmx \ + stdlib__Int.cmx \ + stdlib__Domain.cmx \ camlinternalFormatBasics.cmx \ camlinternalFormat.cmx \ - stdlib__buffer.cmx \ - stdlib__format.cmi -stdlib__format.cmi : \ + stdlib__Buffer.cmx \ + stdlib__Format.cmi +stdlib__Format.cmi : format.mli \ stdlib.cmi \ - stdlib__seq.cmi \ - stdlib__domain.cmi \ - stdlib__buffer.cmi -stdlib__fun.cmo : \ - stdlib__printexc.cmi \ - stdlib__fun.cmi -stdlib__fun.cmx : \ - stdlib__printexc.cmx \ - stdlib__fun.cmi -stdlib__fun.cmi : -stdlib__gc.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__printf.cmi \ - stdlib__printexc.cmi \ - stdlib__gc.cmi -stdlib__gc.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__printf.cmx \ - stdlib__printexc.cmx \ - stdlib__gc.cmi -stdlib__gc.cmi : \ - stdlib__printexc.cmi -stdlib__genlex.cmo : \ - stdlib__string.cmi \ - stdlib__stream.cmi \ - stdlib__list.cmi \ - stdlib__hashtbl.cmi \ - stdlib__char.cmi \ - stdlib__bytes.cmi \ - stdlib__genlex.cmi -stdlib__genlex.cmx : \ - stdlib__string.cmx \ - stdlib__stream.cmx \ - stdlib__list.cmx \ - stdlib__hashtbl.cmx \ - stdlib__char.cmx \ - stdlib__bytes.cmx \ - stdlib__genlex.cmi -stdlib__genlex.cmi : \ - stdlib__stream.cmi -stdlib__hashtbl.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__seq.cmi \ - stdlib__random.cmi \ - stdlib__obj.cmi \ - stdlib__domain.cmi \ - stdlib__array.cmi \ - stdlib__hashtbl.cmi -stdlib__hashtbl.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__seq.cmx \ - stdlib__random.cmx \ - stdlib__obj.cmx \ - stdlib__domain.cmx \ - stdlib__array.cmx \ - stdlib__hashtbl.cmi -stdlib__hashtbl.cmi : \ - stdlib__seq.cmi -stdlib__int.cmo : \ + stdlib__Seq.cmi \ + stdlib__Domain.cmi \ + stdlib__Buffer.cmi +stdlib__Fun.cmo : fun.ml \ + stdlib__Printexc.cmi \ + stdlib__Fun.cmi +stdlib__Fun.cmx : fun.ml \ + stdlib__Printexc.cmx \ + stdlib__Fun.cmi +stdlib__Fun.cmi : fun.mli +stdlib__Gc.cmo : gc.ml \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Printf.cmi \ + stdlib__Printexc.cmi \ + stdlib__Gc.cmi +stdlib__Gc.cmx : gc.ml \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Printf.cmx \ + stdlib__Printexc.cmx \ + stdlib__Gc.cmi +stdlib__Gc.cmi : gc.mli \ + stdlib__Printexc.cmi +stdlib__Genlex.cmo : genlex.ml \ + stdlib__String.cmi \ + stdlib__Stream.cmi \ + stdlib__List.cmi \ + stdlib__Hashtbl.cmi \ + stdlib__Char.cmi \ + stdlib__Bytes.cmi \ + stdlib__Genlex.cmi +stdlib__Genlex.cmx : genlex.ml \ + stdlib__String.cmx \ + stdlib__Stream.cmx \ + stdlib__List.cmx \ + stdlib__Hashtbl.cmx \ + stdlib__Char.cmx \ + stdlib__Bytes.cmx \ + stdlib__Genlex.cmi +stdlib__Genlex.cmi : genlex.mli \ + stdlib__Stream.cmi +stdlib__Hashtbl.cmo : hashtbl.ml \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Seq.cmi \ + stdlib__Random.cmi \ + stdlib__Obj.cmi \ + stdlib__Domain.cmi \ + stdlib__Array.cmi \ + stdlib__Hashtbl.cmi +stdlib__Hashtbl.cmx : hashtbl.ml \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Seq.cmx \ + stdlib__Random.cmx \ + stdlib__Obj.cmx \ + stdlib__Domain.cmx \ + stdlib__Array.cmx \ + stdlib__Hashtbl.cmi +stdlib__Hashtbl.cmi : hashtbl.mli \ + stdlib__Seq.cmi +stdlib__Int.cmo : int.ml \ stdlib.cmi \ - stdlib__int.cmi -stdlib__int.cmx : \ + stdlib__Int.cmi +stdlib__Int.cmx : int.ml \ stdlib.cmx \ - stdlib__int.cmi -stdlib__int.cmi : -stdlib__int32.cmo : \ - stdlib__sys.cmi \ + stdlib__Int.cmi +stdlib__Int.cmi : int.mli +stdlib__Int32.cmo : int32.ml \ + stdlib__Sys.cmi \ stdlib.cmi \ - stdlib__int32.cmi -stdlib__int32.cmx : \ - stdlib__sys.cmx \ + stdlib__Int32.cmi +stdlib__Int32.cmx : int32.ml \ + stdlib__Sys.cmx \ stdlib.cmx \ - stdlib__int32.cmi -stdlib__int32.cmi : -stdlib__int64.cmo : \ + stdlib__Int32.cmi +stdlib__Int32.cmi : int32.mli +stdlib__Int64.cmo : int64.ml \ stdlib.cmi \ - stdlib__int64.cmi -stdlib__int64.cmx : \ + stdlib__Int64.cmi +stdlib__Int64.cmx : int64.ml \ stdlib.cmx \ - stdlib__int64.cmi -stdlib__int64.cmi : -stdlib__lazy.cmo : \ - stdlib__obj.cmi \ + stdlib__Int64.cmi +stdlib__Int64.cmi : int64.mli +stdlib__Lazy.cmo : lazy.ml \ + stdlib__Obj.cmi \ camlinternalLazy.cmi \ - stdlib__lazy.cmi -stdlib__lazy.cmx : \ - stdlib__obj.cmx \ + stdlib__Lazy.cmi +stdlib__Lazy.cmx : lazy.ml \ + stdlib__Obj.cmx \ camlinternalLazy.cmx \ - stdlib__lazy.cmi -stdlib__lazy.cmi : \ + stdlib__Lazy.cmi +stdlib__Lazy.cmi : lazy.mli \ camlinternalLazy.cmi -stdlib__lexing.cmo : \ - stdlib__sys.cmi \ - stdlib__string.cmi \ - stdlib__bytes.cmi \ - stdlib__array.cmi \ - stdlib__lexing.cmi -stdlib__lexing.cmx : \ - stdlib__sys.cmx \ - stdlib__string.cmx \ - stdlib__bytes.cmx \ - stdlib__array.cmx \ - stdlib__lexing.cmi -stdlib__lexing.cmi : -stdlib__list.cmo : \ - stdlib__sys.cmi \ - stdlib__seq.cmi \ - stdlib__either.cmi \ - stdlib__list.cmi -stdlib__list.cmx : \ - stdlib__sys.cmx \ - stdlib__seq.cmx \ - stdlib__either.cmx \ - stdlib__list.cmi -stdlib__list.cmi : \ - stdlib__seq.cmi \ - stdlib__either.cmi -stdlib__listLabels.cmo : \ - stdlib__list.cmi \ - stdlib__listLabels.cmi -stdlib__listLabels.cmx : \ - stdlib__list.cmx \ - stdlib__listLabels.cmi -stdlib__listLabels.cmi : \ - stdlib__seq.cmi \ - stdlib__either.cmi -stdlib__map.cmo : \ - stdlib__seq.cmi \ - stdlib__map.cmi -stdlib__map.cmx : \ - stdlib__seq.cmx \ - stdlib__map.cmi -stdlib__map.cmi : \ - stdlib__seq.cmi -stdlib__marshal.cmo : \ - stdlib__bytes.cmi \ - stdlib__marshal.cmi -stdlib__marshal.cmx : \ - stdlib__bytes.cmx \ - stdlib__marshal.cmi -stdlib__marshal.cmi : -stdlib__moreLabels.cmo : \ - stdlib__set.cmi \ - stdlib__map.cmi \ - stdlib__hashtbl.cmi \ - stdlib__moreLabels.cmi -stdlib__moreLabels.cmx : \ - stdlib__set.cmx \ - stdlib__map.cmx \ - stdlib__hashtbl.cmx \ - stdlib__moreLabels.cmi -stdlib__moreLabels.cmi : \ - stdlib__set.cmi \ - stdlib__seq.cmi \ - stdlib__map.cmi \ - stdlib__hashtbl.cmi -stdlib__mutex.cmo : \ - stdlib__mutex.cmi -stdlib__mutex.cmx : \ - stdlib__mutex.cmi -stdlib__mutex.cmi : -stdlib__nativeint.cmo : \ - stdlib__sys.cmi \ +stdlib__Lexing.cmo : lexing.ml \ + stdlib__Sys.cmi \ + stdlib__String.cmi \ + stdlib__Bytes.cmi \ + stdlib__Array.cmi \ + stdlib__Lexing.cmi +stdlib__Lexing.cmx : lexing.ml \ + stdlib__Sys.cmx \ + stdlib__String.cmx \ + stdlib__Bytes.cmx \ + stdlib__Array.cmx \ + stdlib__Lexing.cmi +stdlib__Lexing.cmi : lexing.mli +stdlib__List.cmo : list.ml \ + stdlib__Sys.cmi \ + stdlib__Seq.cmi \ + stdlib__Either.cmi \ + stdlib__List.cmi +stdlib__List.cmx : list.ml \ + stdlib__Sys.cmx \ + stdlib__Seq.cmx \ + stdlib__Either.cmx \ + stdlib__List.cmi +stdlib__List.cmi : list.mli \ + stdlib__Seq.cmi \ + stdlib__Either.cmi +stdlib__ListLabels.cmo : listLabels.ml \ + stdlib__List.cmi \ + stdlib__ListLabels.cmi +stdlib__ListLabels.cmx : listLabels.ml \ + stdlib__List.cmx \ + stdlib__ListLabels.cmi +stdlib__ListLabels.cmi : listLabels.mli \ + stdlib__Seq.cmi \ + stdlib__Either.cmi +stdlib__Map.cmo : map.ml \ + stdlib__Seq.cmi \ + stdlib__Map.cmi +stdlib__Map.cmx : map.ml \ + stdlib__Seq.cmx \ + stdlib__Map.cmi +stdlib__Map.cmi : map.mli \ + stdlib__Seq.cmi +stdlib__Marshal.cmo : marshal.ml \ + stdlib__Bytes.cmi \ + stdlib__Marshal.cmi +stdlib__Marshal.cmx : marshal.ml \ + stdlib__Bytes.cmx \ + stdlib__Marshal.cmi +stdlib__Marshal.cmi : marshal.mli +stdlib__MoreLabels.cmo : moreLabels.ml \ + stdlib__Set.cmi \ + stdlib__Map.cmi \ + stdlib__Hashtbl.cmi \ + stdlib__MoreLabels.cmi +stdlib__MoreLabels.cmx : moreLabels.ml \ + stdlib__Set.cmx \ + stdlib__Map.cmx \ + stdlib__Hashtbl.cmx \ + stdlib__MoreLabels.cmi +stdlib__MoreLabels.cmi : moreLabels.mli \ + stdlib__Set.cmi \ + stdlib__Seq.cmi \ + stdlib__Map.cmi \ + stdlib__Hashtbl.cmi +stdlib__Mutex.cmo : mutex.ml \ + stdlib__Mutex.cmi +stdlib__Mutex.cmx : mutex.ml \ + stdlib__Mutex.cmi +stdlib__Mutex.cmi : mutex.mli +stdlib__Nativeint.cmo : nativeint.ml \ + stdlib__Sys.cmi \ stdlib.cmi \ - stdlib__nativeint.cmi -stdlib__nativeint.cmx : \ - stdlib__sys.cmx \ + stdlib__Nativeint.cmi +stdlib__Nativeint.cmx : nativeint.ml \ + stdlib__Sys.cmx \ stdlib.cmx \ - stdlib__nativeint.cmi -stdlib__nativeint.cmi : -stdlib__obj.cmo : \ - stdlib__sys.cmi \ - stdlib__nativeint.cmi \ - stdlib__marshal.cmi \ - stdlib__int32.cmi \ - stdlib__obj.cmi -stdlib__obj.cmx : \ - stdlib__sys.cmx \ - stdlib__nativeint.cmx \ - stdlib__marshal.cmx \ - stdlib__int32.cmx \ - stdlib__obj.cmi -stdlib__obj.cmi : \ - stdlib__int32.cmi -stdlib__oo.cmo : \ + stdlib__Nativeint.cmi +stdlib__Nativeint.cmi : nativeint.mli +stdlib__Obj.cmo : obj.ml \ + stdlib__Sys.cmi \ + stdlib__Nativeint.cmi \ + stdlib__Marshal.cmi \ + stdlib__Int32.cmi \ + stdlib__Obj.cmi +stdlib__Obj.cmx : obj.ml \ + stdlib__Sys.cmx \ + stdlib__Nativeint.cmx \ + stdlib__Marshal.cmx \ + stdlib__Int32.cmx \ + stdlib__Obj.cmi +stdlib__Obj.cmi : obj.mli \ + stdlib__Int32.cmi +stdlib__Oo.cmo : oo.ml \ camlinternalOO.cmi \ - stdlib__oo.cmi -stdlib__oo.cmx : \ + stdlib__Oo.cmi +stdlib__Oo.cmx : oo.ml \ camlinternalOO.cmx \ - stdlib__oo.cmi -stdlib__oo.cmi : \ + stdlib__Oo.cmi +stdlib__Oo.cmi : oo.mli \ camlinternalOO.cmi -stdlib__option.cmo : \ - stdlib__seq.cmi \ - stdlib__option.cmi -stdlib__option.cmx : \ - stdlib__seq.cmx \ - stdlib__option.cmi -stdlib__option.cmi : \ - stdlib__seq.cmi -stdlib__parsing.cmo : \ - stdlib__obj.cmi \ - stdlib__lexing.cmi \ - stdlib__array.cmi \ - stdlib__parsing.cmi -stdlib__parsing.cmx : \ - stdlib__obj.cmx \ - stdlib__lexing.cmx \ - stdlib__array.cmx \ - stdlib__parsing.cmi -stdlib__parsing.cmi : \ - stdlib__obj.cmi \ - stdlib__lexing.cmi -stdlib__pervasives.cmo : \ +stdlib__Option.cmo : option.ml \ + stdlib__Seq.cmi \ + stdlib__Option.cmi +stdlib__Option.cmx : option.ml \ + stdlib__Seq.cmx \ + stdlib__Option.cmi +stdlib__Option.cmi : option.mli \ + stdlib__Seq.cmi +stdlib__Parsing.cmo : parsing.ml \ + stdlib__Obj.cmi \ + stdlib__Lexing.cmi \ + stdlib__Array.cmi \ + stdlib__Parsing.cmi +stdlib__Parsing.cmx : parsing.ml \ + stdlib__Obj.cmx \ + stdlib__Lexing.cmx \ + stdlib__Array.cmx \ + stdlib__Parsing.cmi +stdlib__Parsing.cmi : parsing.mli \ + stdlib__Obj.cmi \ + stdlib__Lexing.cmi +stdlib__Pervasives.cmo : pervasives.ml \ camlinternalFormatBasics.cmi -stdlib__pervasives.cmx : \ +stdlib__Pervasives.cmx : pervasives.ml \ camlinternalFormatBasics.cmx -stdlib__printexc.cmo : \ +stdlib__Printexc.cmo : printexc.ml \ stdlib.cmi \ - stdlib__printf.cmi \ - stdlib__obj.cmi \ - stdlib__buffer.cmi \ - stdlib__atomic.cmi \ - stdlib__array.cmi \ - stdlib__printexc.cmi -stdlib__printexc.cmx : \ + stdlib__Printf.cmi \ + stdlib__Obj.cmi \ + stdlib__Buffer.cmi \ + stdlib__Atomic.cmi \ + stdlib__Array.cmi \ + stdlib__Printexc.cmi +stdlib__Printexc.cmx : printexc.ml \ stdlib.cmx \ - stdlib__printf.cmx \ - stdlib__obj.cmx \ - stdlib__buffer.cmx \ - stdlib__atomic.cmx \ - stdlib__array.cmx \ - stdlib__printexc.cmi -stdlib__printexc.cmi : \ - stdlib__obj.cmi -stdlib__printf.cmo : \ + stdlib__Printf.cmx \ + stdlib__Obj.cmx \ + stdlib__Buffer.cmx \ + stdlib__Atomic.cmx \ + stdlib__Array.cmx \ + stdlib__Printexc.cmi +stdlib__Printexc.cmi : printexc.mli \ + stdlib__Obj.cmi +stdlib__Printf.cmo : printf.ml \ camlinternalFormatBasics.cmi \ camlinternalFormat.cmi \ - stdlib__buffer.cmi \ - stdlib__printf.cmi -stdlib__printf.cmx : \ + stdlib__Buffer.cmi \ + stdlib__Printf.cmi +stdlib__Printf.cmx : printf.ml \ camlinternalFormatBasics.cmx \ camlinternalFormat.cmx \ - stdlib__buffer.cmx \ - stdlib__printf.cmi -stdlib__printf.cmi : \ - stdlib__buffer.cmi -stdlib__queue.cmo : \ - stdlib__seq.cmi \ - stdlib__queue.cmi -stdlib__queue.cmx : \ - stdlib__seq.cmx \ - stdlib__queue.cmi -stdlib__queue.cmi : \ - stdlib__seq.cmi -stdlib__random.cmo : \ - stdlib__string.cmi \ + stdlib__Buffer.cmx \ + stdlib__Printf.cmi +stdlib__Printf.cmi : printf.mli \ + stdlib__Buffer.cmi +stdlib__Queue.cmo : queue.ml \ + stdlib__Seq.cmi \ + stdlib__Queue.cmi +stdlib__Queue.cmx : queue.ml \ + stdlib__Seq.cmx \ + stdlib__Queue.cmi +stdlib__Queue.cmi : queue.mli \ + stdlib__Seq.cmi +stdlib__Random.cmo : random.ml \ + stdlib__String.cmi \ stdlib.cmi \ - stdlib__nativeint.cmi \ - stdlib__int64.cmi \ - stdlib__int32.cmi \ - stdlib__int.cmi \ - stdlib__domain.cmi \ - stdlib__digest.cmi \ - stdlib__char.cmi \ - stdlib__array.cmi \ - stdlib__random.cmi -stdlib__random.cmx : \ - stdlib__string.cmx \ + stdlib__Nativeint.cmi \ + stdlib__Int64.cmi \ + stdlib__Int32.cmi \ + stdlib__Int.cmi \ + stdlib__Domain.cmi \ + stdlib__Digest.cmi \ + stdlib__Char.cmi \ + stdlib__Array.cmi \ + stdlib__Random.cmi +stdlib__Random.cmx : random.ml \ + stdlib__String.cmx \ stdlib.cmx \ - stdlib__nativeint.cmx \ - stdlib__int64.cmx \ - stdlib__int32.cmx \ - stdlib__int.cmx \ - stdlib__domain.cmx \ - stdlib__digest.cmx \ - stdlib__char.cmx \ - stdlib__array.cmx \ - stdlib__random.cmi -stdlib__random.cmi : \ - stdlib__nativeint.cmi \ - stdlib__int64.cmi \ - stdlib__int32.cmi -stdlib__result.cmo : \ - stdlib__seq.cmi \ - stdlib__result.cmi -stdlib__result.cmx : \ - stdlib__seq.cmx \ - stdlib__result.cmi -stdlib__result.cmi : \ - stdlib__seq.cmi -stdlib__scanf.cmo : \ - stdlib__string.cmi \ + stdlib__Nativeint.cmx \ + stdlib__Int64.cmx \ + stdlib__Int32.cmx \ + stdlib__Int.cmx \ + stdlib__Domain.cmx \ + stdlib__Digest.cmx \ + stdlib__Char.cmx \ + stdlib__Array.cmx \ + stdlib__Random.cmi +stdlib__Random.cmi : random.mli \ + stdlib__Nativeint.cmi \ + stdlib__Int64.cmi \ + stdlib__Int32.cmi +stdlib__Result.cmo : result.ml \ + stdlib__Seq.cmi \ + stdlib__Result.cmi +stdlib__Result.cmx : result.ml \ + stdlib__Seq.cmx \ + stdlib__Result.cmi +stdlib__Result.cmi : result.mli \ + stdlib__Seq.cmi +stdlib__Scanf.cmo : scanf.ml \ + stdlib__String.cmi \ stdlib.cmi \ - stdlib__printf.cmi \ - stdlib__list.cmi \ + stdlib__Printf.cmi \ + stdlib__List.cmi \ camlinternalFormatBasics.cmi \ camlinternalFormat.cmi \ - stdlib__bytes.cmi \ - stdlib__buffer.cmi \ - stdlib__scanf.cmi -stdlib__scanf.cmx : \ - stdlib__string.cmx \ + stdlib__Bytes.cmi \ + stdlib__Buffer.cmi \ + stdlib__Scanf.cmi +stdlib__Scanf.cmx : scanf.ml \ + stdlib__String.cmx \ stdlib.cmx \ - stdlib__printf.cmx \ - stdlib__list.cmx \ + stdlib__Printf.cmx \ + stdlib__List.cmx \ camlinternalFormatBasics.cmx \ camlinternalFormat.cmx \ - stdlib__bytes.cmx \ - stdlib__buffer.cmx \ - stdlib__scanf.cmi -stdlib__scanf.cmi : \ + stdlib__Bytes.cmx \ + stdlib__Buffer.cmx \ + stdlib__Scanf.cmi +stdlib__Scanf.cmi : scanf.mli \ stdlib.cmi -stdlib__semaphore.cmo : \ - stdlib__mutex.cmi \ - stdlib__condition.cmi \ - stdlib__semaphore.cmi -stdlib__semaphore.cmx : \ - stdlib__mutex.cmx \ - stdlib__condition.cmx \ - stdlib__semaphore.cmi -stdlib__semaphore.cmi : -stdlib__seq.cmo : \ - stdlib__seq.cmi -stdlib__seq.cmx : \ - stdlib__seq.cmi -stdlib__seq.cmi : -stdlib__set.cmo : \ - stdlib__seq.cmi \ - stdlib__list.cmi \ - stdlib__set.cmi -stdlib__set.cmx : \ - stdlib__seq.cmx \ - stdlib__list.cmx \ - stdlib__set.cmi -stdlib__set.cmi : \ - stdlib__seq.cmi -stdlib__stack.cmo : \ - stdlib__seq.cmi \ - stdlib__list.cmi \ - stdlib__stack.cmi -stdlib__stack.cmx : \ - stdlib__seq.cmx \ - stdlib__list.cmx \ - stdlib__stack.cmi -stdlib__stack.cmi : \ - stdlib__seq.cmi -stdlib__stdLabels.cmo : \ - stdlib__stringLabels.cmi \ - stdlib__listLabels.cmi \ - stdlib__bytesLabels.cmi \ - stdlib__arrayLabels.cmi \ - stdlib__stdLabels.cmi -stdlib__stdLabels.cmx : \ - stdlib__stringLabels.cmx \ - stdlib__listLabels.cmx \ - stdlib__bytesLabels.cmx \ - stdlib__arrayLabels.cmx \ - stdlib__stdLabels.cmi -stdlib__stdLabels.cmi : \ - stdlib__stringLabels.cmi \ - stdlib__listLabels.cmi \ - stdlib__bytesLabels.cmi \ - stdlib__arrayLabels.cmi +stdlib__Semaphore.cmo : semaphore.ml \ + stdlib__Mutex.cmi \ + stdlib__Condition.cmi \ + stdlib__Semaphore.cmi +stdlib__Semaphore.cmx : semaphore.ml \ + stdlib__Mutex.cmx \ + stdlib__Condition.cmx \ + stdlib__Semaphore.cmi +stdlib__Semaphore.cmi : semaphore.mli +stdlib__Seq.cmo : seq.ml \ + stdlib__Seq.cmi +stdlib__Seq.cmx : seq.ml \ + stdlib__Seq.cmi +stdlib__Seq.cmi : seq.mli +stdlib__Set.cmo : set.ml \ + stdlib__Seq.cmi \ + stdlib__List.cmi \ + stdlib__Set.cmi +stdlib__Set.cmx : set.ml \ + stdlib__Seq.cmx \ + stdlib__List.cmx \ + stdlib__Set.cmi +stdlib__Set.cmi : set.mli \ + stdlib__Seq.cmi +stdlib__Stack.cmo : stack.ml \ + stdlib__Seq.cmi \ + stdlib__List.cmi \ + stdlib__Stack.cmi +stdlib__Stack.cmx : stack.ml \ + stdlib__Seq.cmx \ + stdlib__List.cmx \ + stdlib__Stack.cmi +stdlib__Stack.cmi : stack.mli \ + stdlib__Seq.cmi +stdlib__StdLabels.cmo : stdLabels.ml \ + stdlib__StringLabels.cmi \ + stdlib__ListLabels.cmi \ + stdlib__BytesLabels.cmi \ + stdlib__ArrayLabels.cmi \ + stdlib__StdLabels.cmi +stdlib__StdLabels.cmx : stdLabels.ml \ + stdlib__StringLabels.cmx \ + stdlib__ListLabels.cmx \ + stdlib__BytesLabels.cmx \ + stdlib__ArrayLabels.cmx \ + stdlib__StdLabels.cmi +stdlib__StdLabels.cmi : stdLabels.mli \ + stdlib__StringLabels.cmi \ + stdlib__ListLabels.cmi \ + stdlib__BytesLabels.cmi \ + stdlib__ArrayLabels.cmi std_exit.cmo : std_exit.cmx : -stdlib__stream.cmo : \ - stdlib__string.cmi \ - stdlib__list.cmi \ - stdlib__lazy.cmi \ - stdlib__bytes.cmi \ - stdlib__stream.cmi -stdlib__stream.cmx : \ - stdlib__string.cmx \ - stdlib__list.cmx \ - stdlib__lazy.cmx \ - stdlib__bytes.cmx \ - stdlib__stream.cmi -stdlib__stream.cmi : -stdlib__string.cmo : \ +stdlib__Stream.cmo : stream.ml \ + stdlib__String.cmi \ + stdlib__List.cmi \ + stdlib__Lazy.cmi \ + stdlib__Bytes.cmi \ + stdlib__Stream.cmi +stdlib__Stream.cmx : stream.ml \ + stdlib__String.cmx \ + stdlib__List.cmx \ + stdlib__Lazy.cmx \ + stdlib__Bytes.cmx \ + stdlib__Stream.cmi +stdlib__Stream.cmi : stream.mli +stdlib__String.cmo : string.ml \ stdlib.cmi \ - stdlib__bytes.cmi \ - stdlib__string.cmi -stdlib__string.cmx : \ + stdlib__Bytes.cmi \ + stdlib__String.cmi +stdlib__String.cmx : string.ml \ stdlib.cmx \ - stdlib__bytes.cmx \ - stdlib__string.cmi -stdlib__string.cmi : \ - stdlib__seq.cmi -stdlib__stringLabels.cmo : \ - stdlib__string.cmi \ - stdlib__stringLabels.cmi -stdlib__stringLabels.cmx : \ - stdlib__string.cmx \ - stdlib__stringLabels.cmi -stdlib__stringLabels.cmi : \ - stdlib__seq.cmi -stdlib__sys.cmo : \ - stdlib__sys.cmi -stdlib__sys.cmx : \ - stdlib__sys.cmi -stdlib__sys.cmi : -stdlib__uchar.cmo : \ + stdlib__Bytes.cmx \ + stdlib__String.cmi +stdlib__String.cmi : string.mli \ + stdlib__Seq.cmi +stdlib__StringLabels.cmo : stringLabels.ml \ + stdlib__String.cmi \ + stdlib__StringLabels.cmi +stdlib__StringLabels.cmx : stringLabels.ml \ + stdlib__String.cmx \ + stdlib__StringLabels.cmi +stdlib__StringLabels.cmi : stringLabels.mli \ + stdlib__Seq.cmi +stdlib__Sys.cmo : sys.ml \ + stdlib__Sys.cmi +stdlib__Sys.cmx : sys.ml \ + stdlib__Sys.cmi +stdlib__Sys.cmi : sys.mli +stdlib__Uchar.cmo : uchar.ml \ stdlib.cmi \ - stdlib__char.cmi \ - stdlib__uchar.cmi -stdlib__uchar.cmx : \ + stdlib__Char.cmi \ + stdlib__Uchar.cmi +stdlib__Uchar.cmx : uchar.ml \ stdlib.cmx \ - stdlib__char.cmx \ - stdlib__uchar.cmi -stdlib__uchar.cmi : -stdlib__unit.cmo : \ - stdlib__unit.cmi -stdlib__unit.cmx : \ - stdlib__unit.cmi -stdlib__unit.cmi : -stdlib__weak.cmo : \ - stdlib__sys.cmi \ - stdlib__obj.cmi \ - stdlib__hashtbl.cmi \ - stdlib__array.cmi \ - stdlib__weak.cmi -stdlib__weak.cmx : \ - stdlib__sys.cmx \ - stdlib__obj.cmx \ - stdlib__hashtbl.cmx \ - stdlib__array.cmx \ - stdlib__weak.cmi -stdlib__weak.cmi : \ - stdlib__hashtbl.cmi -stdlib.cmo : \ + stdlib__Char.cmx \ + stdlib__Uchar.cmi +stdlib__Uchar.cmi : uchar.mli +stdlib__Unit.cmo : unit.ml \ + stdlib__Unit.cmi +stdlib__Unit.cmx : unit.ml \ + stdlib__Unit.cmi +stdlib__Unit.cmi : unit.mli +stdlib__Weak.cmo : weak.ml \ + stdlib__Sys.cmi \ + stdlib__Obj.cmi \ + stdlib__Hashtbl.cmi \ + stdlib__Array.cmi \ + stdlib__Weak.cmi +stdlib__Weak.cmx : weak.ml \ + stdlib__Sys.cmx \ + stdlib__Obj.cmx \ + stdlib__Hashtbl.cmx \ + stdlib__Array.cmx \ + stdlib__Weak.cmi +stdlib__Weak.cmi : weak.mli \ + stdlib__Hashtbl.cmi +stdlib.cmo : stdlib.ml \ camlinternalFormatBasics.cmi \ camlinternalAtomic.cmi \ stdlib.cmi -stdlib.cmx : \ +stdlib.cmx : stdlib.ml \ camlinternalFormatBasics.cmx \ camlinternalAtomic.cmx \ stdlib.cmi -stdlib.cmi : \ +stdlib.cmi : stdlib.mli \ camlinternalFormatBasics.cmi diff --git a/stdlib/Compflags b/stdlib/Compflags index 066e1dc487..9cd5478128 100755 --- a/stdlib/Compflags +++ b/stdlib/Compflags @@ -25,17 +25,17 @@ case $1 in camlinternalOO.cmx) echo ' -inline 0 -afl-inst-ratio 0';; camlinternalLazy.cmx) echo ' -afl-inst-ratio 0';; # never instrument camlinternalOO or camlinternalLazy (PR#7725) - stdlib__buffer.cmx) echo ' -inline 3';; + stdlib__Buffer.cmx) echo ' -inline 3';; # make sure add_char is inlined (PR#5872) - stdlib__buffer.cm[io]) echo ' -w A';; + stdlib__Buffer.cm[io]) echo ' -w A';; camlinternalFormat.cm[io]) echo ' -w Ae';; - stdlib__printf.cm[io]|stdlib__format.cm[io]|stdlib__scanf.cm[io]) + stdlib__Printf.cm[io]|stdlib__Format.cm[io]|stdlib__Scanf.cm[io]) echo ' -w Ae';; - stdlib__scanf.cmx) echo ' -inline 9';; + stdlib__Scanf.cmx) echo ' -inline 9';; *Labels.cmi) echo ' -pp "$AWK -f ./expand_module_aliases.awk"';; *Labels.cm[ox]) echo ' -nolabels -no-alias-deps';; - stdlib__float.cm[ox]) echo ' -nolabels -no-alias-deps';; - stdlib__oo.cmi) echo ' -no-principal';; + stdlib__Float.cm[ox]) echo ' -nolabels -no-alias-deps';; + stdlib__Oo.cmi) echo ' -no-principal';; # preserve structure sharing in Oo.copy (PR#9767) *) echo ' ';; esac diff --git a/stdlib/HACKING.adoc b/stdlib/HACKING.adoc index 988300dd19..da1a2ee1e8 100644 --- a/stdlib/HACKING.adoc +++ b/stdlib/HACKING.adoc @@ -17,7 +17,7 @@ To add a new module, you must: the same style as the rest of the code, in particular the alphabetical ordering and whitespace alignment of module aliases. -* Add `module_name` to the definition of `STDLIB_MODS` in +* Add `module_name` to the definition of `STDLIB_MODULE_BASENAMES` in `stdlib/StdlibModules`. You must keep the list sorted in dependency order. * Run `make alldepend` to update all the `.depend` files. These files are not diff --git a/stdlib/Makefile b/stdlib/Makefile index 7123ad2cae..fe6f6b5330 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -40,9 +40,6 @@ OBJS=$(addsuffix .cmo,$(STDLIB_MODULES)) NOSTDLIB= camlinternalFormatBasics.cmo camlinternalAtomic.cmo stdlib.cmo OTHERS=$(filter-out $(NOSTDLIB),$(OBJS)) -PREFIXED_OBJS=$(filter stdlib__%.cmo,$(OBJS)) -UNPREFIXED_OBJS=$(PREFIXED_OBJS:stdlib__%.cmo=%) - .PHONY: all all: stdlib.cma std_exit.cmo camlheader target_camlheader camlheader_ur @@ -200,21 +197,29 @@ export AWK %.cmi: %.mli $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) -c $< -stdlib__%.cmi: %.mli - $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) -o $@ -c $< +# The dependency on the .mli file is in .depend (since stdlib__Foo.cmi +# depends on stdlib__foo.mli) +stdlib__%.cmi: + $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) \ + -o $@ -c $(filter %.mli, $^) %.cmo: %.ml $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) -c $< -stdlib__%.cmo: %.ml - $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) -o $@ -c $< +# The dependency on the .ml file is in .depend (since stdlib__Foo.cmo +# depends on stdlib__foo.ml) +stdlib__%.cmo: + $(CAMLC) $(COMPFLAGS) $(shell ./Compflags $@) \ + -o $@ -c $(filter %.ml, $^) %.cmx: %.ml $(CAMLOPT) $(COMPFLAGS) $(OPTCOMPFLAGS) $(shell ./Compflags $@) -c $< -stdlib__%.cmx: %.ml +# The dependency on the .ml file is in .depend (since stdlib__Foo.cmx +# depends on stdlib__foo.ml) +stdlib__%.cmx: $(CAMLOPT) $(COMPFLAGS) $(OPTCOMPFLAGS) $(shell ./Compflags $@) \ - -o $@ -c $< + -o $@ -c $(filter %.ml, $^) # Dependencies on the compiler COMPILER_DEPS=$(filter-out -use-prims $(CAMLRUN), $(CAMLC)) @@ -237,13 +242,16 @@ include .depend EMPTY := SPACE := $(EMPTY) $(EMPTY) +STDLIB_NAMESPACE_MODULES = $(subst $(SPACE),|,$(STDLIB_PREFIXED_MODULES)) + .PHONY: depend depend: $(CAMLDEP) $(DEPFLAGS) $(filter-out stdlib.%,$(wildcard *.mli *.ml)) \ > .depend.tmp $(CAMLDEP) $(DEPFLAGS) -pp "$(AWK) -f ./remove_module_aliases.awk" \ stdlib.ml stdlib.mli >> .depend.tmp - sed -Ee \ - 's#(^| )(${subst ${SPACE},|,${UNPREFIXED_OBJS}})[.]#\1stdlib__\2.#g' \ + sed -E \ + -e 's/^(${STDLIB_NAMESPACE_MODULES})(\.[^i]*)(i?) :/\1\2\3 : \1.ml\3/' \ + -e 's#(^| )(${STDLIB_NAMESPACE_MODULES})[.]#\1stdlib__\u\2.#' \ .depend.tmp > .depend rm -f .depend.tmp diff --git a/stdlib/StdlibModules b/stdlib/StdlibModules index af971ef069..87d431ed42 100644 --- a/stdlib/StdlibModules +++ b/stdlib/StdlibModules @@ -15,21 +15,23 @@ #* * #************************************************************************** -# This file lists all standard library modules. -# It is used by: +# This file lists all standard library modules. It is used by: # 1. stdlib/Makefile when building stdlib.cma # 2. Makefile to expunge the toplevels -# 3. ocamldoc/Makefile.docfiles to compute all documentation files -# which need to be generated for the stdlib +# 3. api_docgen/Makefile.docfiles to compute all documentation files which need +# need to be generated for the stdlib -# add stdlib__ as prefix to a module except for internal modules -# and the stdlib module itself -define add_stdlib_prefix - $(or $(filter stdlib camlinternal%,$1), stdlib__$1) -endef +# Three variables are exported: +# $(STDLIB_MODULE_BASENAMES) - basenames, in dependency order, of the modules in +# the stdlib +# $(STDLIB_PREFIXED_MODULES) - just the namespaced modules of +# $(STDLIB_MODULE_BASENAMES), i.e. without camlinternal* and stdlib. Used in +# stdlib/Makefile to munge the dependencies. +# $(STDLIB_MODULES) - full list, in prefixed form as appropriate. -# Modules should be listed in dependency order. -STDLIB_MODS=\ +# Basenames of the source files for the standard library (i.e. unprefixed and +# with lowercase first letters). These must be listed in dependency order. +STDLIB_MODULE_BASENAMES=\ camlinternalFormatBasics camlinternalAtomic \ stdlib pervasives seq option either result bool char uchar \ sys list bytes string unit marshal obj array float int int32 int64 nativeint \ @@ -41,5 +43,17 @@ STDLIB_MODS=\ filename complex arrayLabels listLabels bytesLabels stringLabels moreLabels \ stdLabels bigarray -STDLIB_MODULES=\ - $(foreach module, $(STDLIB_MODS), $(call add_stdlib_prefix,$(module))) +STDLIB_PREFIXED_MODULES=\ + $(filter-out stdlib camlinternal%, $(STDLIB_MODULE_BASENAMES)) + +# add stdlib__ as prefix to a module except for internal modules +# and the stdlib module itself +define add_stdlib_prefix + $(or $(filter-out $(STDLIB_PREFIXED_MODULES), $1), \ + stdlib__$(shell echo $1 | cut -c1 | tr '[:lower:]' '[:upper:]')$\ + $(shell echo $1 | cut -c2-)) +endef + +STDLIB_MODULES:=\ + $(foreach module, $(STDLIB_MODULE_BASENAMES), \ + $(call add_stdlib_prefix,$(module))) diff --git a/stdlib/dune b/stdlib/dune index f1c8e4d62c..ddfce6b692 100644 --- a/stdlib/dune +++ b/stdlib/dune @@ -24,8 +24,7 @@ (preprocess (per_module ((action - (run awk -v dune_wrapped=true - -f %{dep:expand_module_aliases.awk} %{input-file})) + (run awk -f %{dep:expand_module_aliases.awk} %{input-file})) stdlib) ))) diff --git a/stdlib/expand_module_aliases.awk b/stdlib/expand_module_aliases.awk index 515282d4f8..4b7e58c256 100644 --- a/stdlib/expand_module_aliases.awk +++ b/stdlib/expand_module_aliases.awk @@ -24,10 +24,7 @@ NR == 1 { printf ("# 1 \"%s\"\n", FILENAME) } state=2; else if ($1 == "module") { if (ocamldoc!="true") printf("\n(** @canonical %s *)", $2); - first_letter=substr($4,1,1); - if (dune_wrapped!="true") - first_letter=tolower(first_letter); - printf("\nmodule %s = Stdlib__%s%s\n", $2, first_letter, substr($4,2)); + printf("\nmodule %s = Stdlib__%s\n", $2, $4); } else print diff --git a/testsuite/tests/backtrace/backtrace2.reference b/testsuite/tests/backtrace/backtrace2.reference index 12f5849ef1..5b881fd97e 100644 --- a/testsuite/tests/backtrace/backtrace2.reference +++ b/testsuite/tests/backtrace/backtrace2.reference @@ -35,7 +35,7 @@ Uncaught exception Invalid_argument("index out of bounds") Raised by primitive operation at Backtrace2.run in file "backtrace2.ml", line 63, characters 14-22 test_Not_found Uncaught exception Not_found -Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 44, characters 9-42 Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 44, characters 61-70 Called from Backtrace2.run in file "backtrace2.ml", line 63, characters 11-23 @@ -50,7 +50,7 @@ Called from CamlinternalLazy.do_force_block in file "camlinternalLazy.ml", line Re-raised at CamlinternalLazy.do_force_block in file "camlinternalLazy.ml", line 81, characters 4-11 Called from Backtrace2.run in file "backtrace2.ml", line 63, characters 11-23 Uncaught exception Not_found -Raised at Stdlib__hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 51, characters 8-41 Re-raised at CamlinternalLazy.do_force_block.(fun) in file "camlinternalLazy.ml", line 78, characters 50-57 Called from CamlinternalLazy.do_force_block in file "camlinternalLazy.ml", line 71, characters 17-27 diff --git a/testsuite/tests/backtrace/backtrace_dynlink.reference b/testsuite/tests/backtrace/backtrace_dynlink.reference index 3f5647015d..d44f66af33 100644 --- a/testsuite/tests/backtrace/backtrace_dynlink.reference +++ b/testsuite/tests/backtrace/backtrace_dynlink.reference @@ -1,17 +1,17 @@ Raised by primitive operation at Backtrace_dynlink_plugin in file "backtrace_dynlink_plugin.ml", line 6, characters 13-38 Called from Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 85, characters 12-29 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Called from Dynlink_common.Make.loadfile in file "otherlibs/dynlink/dynlink_common.ml" (inlined), line 357, characters 26-45 Called from Backtrace_dynlink in file "backtrace_dynlink.ml", line 35, characters 4-52 execution of module initializers in the shared library failed: Failure("SUCCESS") Raised by primitive operation at Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 85, characters 12-29 Re-raised at Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 87, characters 10-149 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 355, characters 8-17 Called from Dynlink_common.Make.loadfile in file "otherlibs/dynlink/dynlink_common.ml" (inlined), line 357, characters 26-45 diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference index a947322d02..31f488332a 100755 --- a/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference +++ b/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference @@ -6,7 +6,7 @@ Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6 Called from Dynlink.Bytecode.run in file "otherlibs/dynlink/dynlink.ml", line 137, characters 16-25 Re-raised at Dynlink.Bytecode.run in file "otherlibs/dynlink/dynlink.ml", line 139, characters 6-137 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 355, characters 8-17 Called from Test10_main in file "test10_main.ml", line 51, characters 13-69 diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference index 0e84488d01..5dea784a2e 100755 --- a/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference +++ b/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference @@ -1,9 +1,9 @@ Error: Failure("Plugin error") Raised by primitive operation at Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 85, characters 12-29 Re-raised at Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 87, characters 10-149 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 355, characters 8-17 Called from Dynlink_common.Make.loadfile in file "otherlibs/dynlink/dynlink_common.ml" (inlined), line 357, characters 26-45 diff --git a/testsuite/tests/statmemprof/callstacks.flat-float-array.reference b/testsuite/tests/statmemprof/callstacks.flat-float-array.reference index 3de29235f8..baea29a0d5 100644 --- a/testsuite/tests/statmemprof/callstacks.flat-float-array.reference +++ b/testsuite/tests/statmemprof/callstacks.flat-float-array.reference @@ -1,74 +1,74 @@ ----------- Raised by primitive operation at Callstacks.alloc_list_literal in file "callstacks.ml", line 18, characters 30-53 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_pair in file "callstacks.ml", line 21, characters 30-76 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_record in file "callstacks.ml", line 26, characters 12-66 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_some in file "callstacks.ml", line 29, characters 30-60 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_array_literal in file "callstacks.ml", line 32, characters 30-55 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_float_array_literal in file "callstacks.ml", line 36, characters 12-62 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.do_alloc_unknown_array_literal in file "callstacks.ml", line 39, characters 22-27 Called from Callstacks.alloc_unknown_array_literal in file "callstacks.ml", line 41, characters 30-65 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_small_array in file "callstacks.ml", line 44, characters 30-69 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_large_array in file "callstacks.ml", line 47, characters 30-73 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_closure.(fun) in file "callstacks.ml", line 51, characters 30-43 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.get0 in file "callstacks.ml", line 54, characters 28-33 Called from Callstacks.getfloatfield in file "callstacks.ml", line 56, characters 30-47 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- -Raised by primitive operation at Stdlib__marshal.from_bytes in file "marshal.ml", line 61, characters 9-35 +Raised by primitive operation at Stdlib__Marshal.from_bytes in file "marshal.ml", line 61, characters 9-35 Called from Callstacks.alloc_unmarshal in file "callstacks.ml", line 62, characters 12-87 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_ref in file "callstacks.ml", line 65, characters 30-59 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.prod_floats in file "callstacks.ml", line 68, characters 37-43 Called from Callstacks.alloc_boxedfloat in file "callstacks.ml", line 70, characters 30-49 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 diff --git a/testsuite/tests/statmemprof/callstacks.no-flat-float-array.reference b/testsuite/tests/statmemprof/callstacks.no-flat-float-array.reference index 0fa12e7905..71d395865d 100644 --- a/testsuite/tests/statmemprof/callstacks.no-flat-float-array.reference +++ b/testsuite/tests/statmemprof/callstacks.no-flat-float-array.reference @@ -1,70 +1,70 @@ ----------- Raised by primitive operation at Callstacks.alloc_list_literal in file "callstacks.ml", line 18, characters 30-53 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_pair in file "callstacks.ml", line 21, characters 30-76 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_record in file "callstacks.ml", line 26, characters 12-66 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_some in file "callstacks.ml", line 29, characters 30-60 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_array_literal in file "callstacks.ml", line 32, characters 30-55 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_float_array_literal in file "callstacks.ml", line 36, characters 12-62 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.do_alloc_unknown_array_literal in file "callstacks.ml", line 39, characters 22-27 Called from Callstacks.alloc_unknown_array_literal in file "callstacks.ml", line 41, characters 30-65 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_small_array in file "callstacks.ml", line 44, characters 30-69 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_large_array in file "callstacks.ml", line 47, characters 30-73 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_closure.(fun) in file "callstacks.ml", line 51, characters 30-43 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- No callstack ----------- -Raised by primitive operation at Stdlib__marshal.from_bytes in file "marshal.ml", line 61, characters 9-35 +Raised by primitive operation at Stdlib__Marshal.from_bytes in file "marshal.ml", line 61, characters 9-35 Called from Callstacks.alloc_unmarshal in file "callstacks.ml", line 62, characters 12-87 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_ref in file "callstacks.ml", line 65, characters 30-59 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.prod_floats in file "callstacks.ml", line 68, characters 37-43 Called from Callstacks.alloc_boxedfloat in file "callstacks.ml", line 70, characters 30-49 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 diff --git a/testsuite/tests/statmemprof/comballoc.byte.reference b/testsuite/tests/statmemprof/comballoc.byte.reference index 60f8b1b301..4db26f1c99 100644 --- a/testsuite/tests/statmemprof/comballoc.byte.reference +++ b/testsuite/tests/statmemprof/comballoc.byte.reference @@ -1,49 +1,49 @@ 2: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.42 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.01 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.83 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 OK diff --git a/testsuite/tests/statmemprof/comballoc.opt.reference b/testsuite/tests/statmemprof/comballoc.opt.reference index 79d5a85dfc..3afd163aa8 100644 --- a/testsuite/tests/statmemprof/comballoc.opt.reference +++ b/testsuite/tests/statmemprof/comballoc.opt.reference @@ -1,49 +1,49 @@ 2: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.42 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.01 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.83 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__list.iter in file "list.ml", line 110, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 110, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 OK diff --git a/testsuite/tests/tool-toplevel/pr6468.compilers.reference b/testsuite/tests/tool-toplevel/pr6468.compilers.reference index 0a04a28f4f..38e0a56e93 100644 --- a/testsuite/tests/tool-toplevel/pr6468.compilers.reference +++ b/testsuite/tests/tool-toplevel/pr6468.compilers.reference @@ -8,7 +8,7 @@ val g : unit -> int = <fun> Exception: Not_found. Raised at f in file "//toplevel//", line 2, characters 11-26 Called from g in file "//toplevel//", line 1, characters 11-15 -Called from Stdlib__fun.protect in file "fun.ml", line 33, characters 8-15 -Re-raised at Stdlib__fun.protect in file "fun.ml", line 38, characters 6-52 +Called from Stdlib__Fun.protect in file "fun.ml", line 33, characters 8-15 +Re-raised at Stdlib__Fun.protect in file "fun.ml", line 38, characters 6-52 Called from Topeval.load_lambda in file "toplevel/byte/topeval.ml", line 114, characters 4-150 diff --git a/testsuite/tests/translprim/comparison_table.compilers.reference b/testsuite/tests/translprim/comparison_table.compilers.reference index c5a19fc589..91f83ff756 100644 --- a/testsuite/tests/translprim/comparison_table.compilers.reference +++ b/testsuite/tests/translprim/comparison_table.compilers.reference @@ -153,7 +153,7 @@ (apply f (field_imm 0 param) (field_imm 1 param))) map = (function f l - (apply (field_imm 18 (global Stdlib__list!)) + (apply (field_imm 18 (global Stdlib__List!)) (apply uncurry f) l))) (makeblock 0 (makeblock 0 (apply map gen_cmp vec) (apply map cmp vec)) @@ -192,7 +192,7 @@ (apply f (field_imm 0 param) (field_imm 1 param))) map = (function f l - (apply (field_imm 18 (global Stdlib__list!)) + (apply (field_imm 18 (global Stdlib__List!)) (apply uncurry f) l))) (makeblock 0 (makeblock 0 (apply map eta_gen_cmp vec) diff --git a/typing/typeopt.ml b/typing/typeopt.ml index 8ca209a5cf..35418ba03e 100644 --- a/typing/typeopt.ml +++ b/typing/typeopt.ml @@ -122,7 +122,7 @@ let array_pattern_kind pat = array_type_kind pat.pat_env pat.pat_type let bigarray_decode_type env ty tbl dfl = match scrape env ty with | Tconstr(Pdot(Pident mod_id, type_name), [], _) - when Ident.name mod_id = "Stdlib__bigarray" -> + when Ident.name mod_id = "Stdlib__Bigarray" -> begin try List.assoc type_name tbl with Not_found -> dfl end | _ -> dfl |