Skip to content

Commit fbea66a

Browse files
author
Damien Doligez
committed
fusion des changements 3.09.2 -> 3.09.3
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
1 parent 403f1e1 commit fbea66a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3464
-2041
lines changed

.depend

+24-26
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ typing/includeclass.cmi: typing/types.cmi typing/typedtree.cmi typing/env.cmi \
6262
typing/ctype.cmi
6363
typing/includecore.cmi: typing/types.cmi typing/typedtree.cmi \
6464
typing/ident.cmi typing/env.cmi
65-
typing/includemod.cmi: typing/types.cmi typing/typedtree.cmi typing/ident.cmi \
66-
typing/env.cmi typing/ctype.cmi
65+
typing/includemod.cmi: typing/types.cmi typing/typedtree.cmi typing/path.cmi \
66+
typing/ident.cmi typing/env.cmi typing/ctype.cmi
6767
typing/mtype.cmi: typing/types.cmi typing/path.cmi typing/ident.cmi \
6868
typing/env.cmi
6969
typing/oprint.cmi: typing/outcometree.cmi
@@ -112,11 +112,11 @@ typing/datarepr.cmx: typing/types.cmx typing/predef.cmx utils/misc.cmx \
112112
typing/env.cmo: typing/types.cmi utils/tbl.cmi typing/subst.cmi \
113113
typing/predef.cmi typing/path.cmi utils/misc.cmi parsing/longident.cmi \
114114
typing/ident.cmi typing/datarepr.cmi utils/consistbl.cmi utils/config.cmi \
115-
typing/btype.cmi parsing/asttypes.cmi typing/env.cmi
115+
utils/clflags.cmi typing/btype.cmi parsing/asttypes.cmi typing/env.cmi
116116
typing/env.cmx: typing/types.cmx utils/tbl.cmx typing/subst.cmx \
117117
typing/predef.cmx typing/path.cmx utils/misc.cmx parsing/longident.cmx \
118118
typing/ident.cmx typing/datarepr.cmx utils/consistbl.cmx utils/config.cmx \
119-
typing/btype.cmx parsing/asttypes.cmi typing/env.cmi
119+
utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi typing/env.cmi
120120
typing/ident.cmo: typing/ident.cmi
121121
typing/ident.cmx: typing/ident.cmi
122122
typing/includeclass.cmo: typing/types.cmi typing/printtyp.cmi \
@@ -443,8 +443,8 @@ asmcomp/asmlink.cmi: asmcomp/compilenv.cmi
443443
asmcomp/clambda.cmi: bytecomp/lambda.cmi typing/ident.cmi \
444444
parsing/asttypes.cmi
445445
asmcomp/closure.cmi: bytecomp/lambda.cmi asmcomp/clambda.cmi
446-
asmcomp/cmmgen.cmi: asmcomp/cmm.cmi asmcomp/clambda.cmi
447446
asmcomp/cmm.cmi: typing/ident.cmi
447+
asmcomp/cmmgen.cmi: asmcomp/cmm.cmi asmcomp/clambda.cmi
448448
asmcomp/codegen.cmi: asmcomp/cmm.cmi
449449
asmcomp/comballoc.cmi: asmcomp/mach.cmi
450450
asmcomp/compilenv.cmi: typing/ident.cmi asmcomp/clambda.cmi
@@ -458,8 +458,8 @@ asmcomp/printlinear.cmi: asmcomp/linearize.cmi
458458
asmcomp/printmach.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
459459
asmcomp/proc.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
460460
asmcomp/reg.cmi: asmcomp/cmm.cmi
461-
asmcomp/reloadgen.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
462461
asmcomp/reload.cmi: asmcomp/mach.cmi
462+
asmcomp/reloadgen.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
463463
asmcomp/schedgen.cmi: asmcomp/mach.cmi asmcomp/linearize.cmi
464464
asmcomp/scheduling.cmi: asmcomp/linearize.cmi
465465
asmcomp/selectgen.cmi: utils/tbl.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
@@ -523,6 +523,8 @@ asmcomp/closure.cmx: utils/tbl.cmx bytecomp/switch.cmx typing/primitive.cmx \
523523
utils/misc.cmx bytecomp/lambda.cmx typing/ident.cmx asmcomp/compilenv.cmx \
524524
utils/clflags.cmx asmcomp/clambda.cmx parsing/asttypes.cmi \
525525
asmcomp/closure.cmi
526+
asmcomp/cmm.cmo: typing/ident.cmi asmcomp/arch.cmo asmcomp/cmm.cmi
527+
asmcomp/cmm.cmx: typing/ident.cmx asmcomp/arch.cmx asmcomp/cmm.cmi
526528
asmcomp/cmmgen.cmo: typing/types.cmi bytecomp/switch.cmi asmcomp/proc.cmi \
527529
typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi typing/ident.cmi \
528530
utils/config.cmi asmcomp/compilenv.cmi asmcomp/cmm.cmi utils/clflags.cmi \
@@ -533,8 +535,6 @@ asmcomp/cmmgen.cmx: typing/types.cmx bytecomp/switch.cmx asmcomp/proc.cmx \
533535
utils/config.cmx asmcomp/compilenv.cmx asmcomp/cmm.cmx utils/clflags.cmx \
534536
asmcomp/clambda.cmx parsing/asttypes.cmi asmcomp/arch.cmx \
535537
asmcomp/cmmgen.cmi
536-
asmcomp/cmm.cmo: typing/ident.cmi asmcomp/arch.cmo asmcomp/cmm.cmi
537-
asmcomp/cmm.cmx: typing/ident.cmx asmcomp/arch.cmx asmcomp/cmm.cmi
538538
asmcomp/codegen.cmo: asmcomp/split.cmi asmcomp/spill.cmi asmcomp/reload.cmi \
539539
asmcomp/reg.cmi asmcomp/printmach.cmi asmcomp/printlinear.cmi \
540540
asmcomp/printcmm.cmi asmcomp/liveness.cmi asmcomp/linearize.cmi \
@@ -555,16 +555,16 @@ asmcomp/compilenv.cmo: utils/misc.cmi typing/ident.cmi typing/env.cmi \
555555
utils/config.cmi asmcomp/clambda.cmi asmcomp/compilenv.cmi
556556
asmcomp/compilenv.cmx: utils/misc.cmx typing/ident.cmx typing/env.cmx \
557557
utils/config.cmx asmcomp/clambda.cmx asmcomp/compilenv.cmi
558-
asmcomp/emitaux.cmo: asmcomp/emitaux.cmi
559-
asmcomp/emitaux.cmx: asmcomp/emitaux.cmi
560558
asmcomp/emit.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
561559
asmcomp/mach.cmi parsing/location.cmi asmcomp/linearize.cmi \
562560
asmcomp/emitaux.cmi utils/config.cmi asmcomp/compilenv.cmi \
563-
asmcomp/cmm.cmi utils/clflags.cmi asmcomp/arch.cmo asmcomp/emit.cmi
561+
asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/emit.cmi
564562
asmcomp/emit.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
565563
asmcomp/mach.cmx parsing/location.cmx asmcomp/linearize.cmx \
566564
asmcomp/emitaux.cmx utils/config.cmx asmcomp/compilenv.cmx \
567-
asmcomp/cmm.cmx utils/clflags.cmx asmcomp/arch.cmx asmcomp/emit.cmi
565+
asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/emit.cmi
566+
asmcomp/emitaux.cmo: asmcomp/emitaux.cmi
567+
asmcomp/emitaux.cmx: asmcomp/emitaux.cmi
568568
asmcomp/interf.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
569569
asmcomp/mach.cmi asmcomp/interf.cmi
570570
asmcomp/interf.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
@@ -599,34 +599,32 @@ asmcomp/proc.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
599599
asmcomp/arch.cmx asmcomp/proc.cmi
600600
asmcomp/reg.cmo: asmcomp/cmm.cmi asmcomp/reg.cmi
601601
asmcomp/reg.cmx: asmcomp/cmm.cmx asmcomp/reg.cmi
602+
asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reload.cmi
603+
asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reload.cmi
602604
asmcomp/reloadgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
603605
asmcomp/reloadgen.cmi
604606
asmcomp/reloadgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
605607
asmcomp/reloadgen.cmi
606-
asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
607-
asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/reload.cmi
608-
asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reg.cmx asmcomp/mach.cmx \
609-
asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/reload.cmi
610608
asmcomp/schedgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
611609
asmcomp/linearize.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
612610
asmcomp/schedgen.cmi
613611
asmcomp/schedgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
614612
asmcomp/linearize.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
615613
asmcomp/schedgen.cmi
616-
asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/scheduling.cmi
617-
asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/scheduling.cmi
614+
asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/mach.cmi \
615+
asmcomp/arch.cmo asmcomp/scheduling.cmi
616+
asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/mach.cmx \
617+
asmcomp/arch.cmx asmcomp/scheduling.cmi
618618
asmcomp/selectgen.cmo: utils/tbl.cmi asmcomp/reg.cmi asmcomp/proc.cmi \
619619
utils/misc.cmi asmcomp/mach.cmi typing/ident.cmi asmcomp/cmm.cmi \
620620
asmcomp/arch.cmo asmcomp/selectgen.cmi
621621
asmcomp/selectgen.cmx: utils/tbl.cmx asmcomp/reg.cmx asmcomp/proc.cmx \
622622
utils/misc.cmx asmcomp/mach.cmx typing/ident.cmx asmcomp/cmm.cmx \
623623
asmcomp/arch.cmx asmcomp/selectgen.cmi
624-
asmcomp/selection.cmo: asmcomp/selectgen.cmi asmcomp/reg.cmi asmcomp/proc.cmi \
625-
utils/misc.cmi asmcomp/mach.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
626-
asmcomp/selection.cmi
627-
asmcomp/selection.cmx: asmcomp/selectgen.cmx asmcomp/reg.cmx asmcomp/proc.cmx \
628-
utils/misc.cmx asmcomp/mach.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
629-
asmcomp/selection.cmi
624+
asmcomp/selection.cmo: asmcomp/selectgen.cmi asmcomp/reg.cmi utils/misc.cmi \
625+
asmcomp/mach.cmi asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/selection.cmi
626+
asmcomp/selection.cmx: asmcomp/selectgen.cmx asmcomp/reg.cmx utils/misc.cmx \
627+
asmcomp/mach.cmx asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/selection.cmi
630628
asmcomp/spill.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
631629
asmcomp/mach.cmi asmcomp/spill.cmi
632630
asmcomp/spill.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
@@ -665,8 +663,6 @@ driver/errors.cmx: utils/warnings.cmx typing/typetexp.cmx typing/typemod.cmx \
665663
parsing/location.cmx parsing/lexer.cmx typing/includemod.cmx \
666664
typing/env.cmx typing/ctype.cmx bytecomp/bytepackager.cmx \
667665
bytecomp/bytelink.cmx bytecomp/bytelibrarian.cmx driver/errors.cmi
668-
driver/main_args.cmo: driver/main_args.cmi
669-
driver/main_args.cmx: driver/main_args.cmi
670666
driver/main.cmo: utils/warnings.cmi utils/misc.cmi driver/main_args.cmi \
671667
driver/errors.cmi utils/config.cmi driver/compile.cmi utils/clflags.cmi \
672668
bytecomp/bytepackager.cmi bytecomp/bytelink.cmi \
@@ -675,6 +671,8 @@ driver/main.cmx: utils/warnings.cmx utils/misc.cmx driver/main_args.cmx \
675671
driver/errors.cmx utils/config.cmx driver/compile.cmx utils/clflags.cmx \
676672
bytecomp/bytepackager.cmx bytecomp/bytelink.cmx \
677673
bytecomp/bytelibrarian.cmx driver/main.cmi
674+
driver/main_args.cmo: driver/main_args.cmi
675+
driver/main_args.cmx: driver/main_args.cmi
678676
driver/optcompile.cmo: utils/warnings.cmi typing/unused_var.cmi \
679677
typing/typemod.cmi typing/typedtree.cmi bytecomp/translmod.cmi \
680678
bytecomp/simplif.cmi typing/printtyp.cmi bytecomp/printlambda.cmi \

Changes

+38-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,43 @@ Language features:
77
definition replaces the old one, rather than creating a new
88
variable.
99

10+
11+
Objective Caml 3.09.3:
12+
----------------------
13+
14+
Bug fixes:
15+
- ocamldoc: -using modtype constraint to filter module elements displayed
16+
in doc PR#4016
17+
- ocamldoc: error in merging of top dependencies of modules PR#4007
18+
- ocamldoc: -dot-colors has no effect PR#3981
19+
- ocamdloc: missing crossref in text from intro files PR#4066
20+
- compilers: segfault with recursive modules PR#4008
21+
- compilers: infinite loop when compiling objects PR#4018
22+
- compilers: bad error message when signature mismatch PR#4001
23+
- compilers: infinite loop with -rectypes PR#3999
24+
- compilers: contravariance bug in private rows
25+
- compilers: unsafe cast with polymorphic exception PR#4002
26+
- native compiler: bad assembly code generated for AMD64 PR#4067
27+
- native compiler: stack alignment problems on MacOSX/i386 PR#4036
28+
- stdlib: crash in marshalling PR#4030
29+
- stdlib: crash when closing a channel twice PR#4039
30+
- stdlib: memory leak in Sys.readdir PR#4093
31+
- C interface: better definition of CAMLreturn PR#4068
32+
- otherlibs/unix: crash in gethostbyname PR#3043
33+
- tools: subtle problem with unset in makefile PR#4048
34+
- camlp4: install pa_o_fast.o PR#3812
35+
- camlp4: install more modules PR#3689
36+
37+
New features:
38+
- ocamldoc: name resolution in cross-referencing {!name}: if name is not
39+
found, then it is searched in the parent module/class, and in the parent
40+
of the parent, and so on until it is found.
41+
- ocamldoc: new option -short-functors to use a short form to display
42+
functors in html generator PR#4017
43+
- ocamlprof: added "-version" option
44+
45+
46+
1047
Objective Caml 3.09.2:
1148
----------------------
1249

@@ -31,7 +68,7 @@ Bug fixes:
3168
- stdlib: Filename.dirname/basename wrong on Win32 PR#3933
3269
- stdlib: incomplete documentation of Pervasives.abs PR#3967
3370
- stdlib: Printf bugs PR#3902, PR#3955
34-
- tools/checkstack.c missing include
71+
- tools/checkstack.c: missing include
3572
- yacc: crash when given argument "-" PR#3956
3673

3774
New features:

README

+11-14
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ native-code compiler currently runs on the following platforms:
2222
Tier 1 (actively used and maintained by the core Caml team):
2323

2424
AMD64 (Opteron) Linux
25-
IA32 (Pentium) Linux, FreeBSD, MS Windows
25+
IA32 (Pentium) Linux, FreeBSD, MacOS X, MS Windows
2626
PowerPC MacOS X
2727

28-
Tier 2 (maintained but less actively, with help from users):
28+
Tier 2 (maintained when possible, with help from users):
2929

3030
Alpha Digital Unix/Compaq Tru64, Linux, all BSD
3131
AMD64 FreeBSD, OpenBSD
@@ -78,9 +78,9 @@ CONTENTS:
7878
COPYRIGHT:
7979

8080
All files marked "Copyright INRIA" in this distribution are copyright
81-
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Institut National de
82-
Recherche en Informatique et en Automatique (INRIA) and distributed
83-
under the conditions stated in file LICENSE.
81+
1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
82+
Institut National de Recherche en Informatique et en Automatique
83+
(INRIA) and distributed under the conditions stated in file LICENSE.
8484

8585
INSTALLATION:
8686

@@ -112,11 +112,9 @@ Messages to the list should be sent to:
112112

113113
caml-list@inria.fr
114114

115-
If you wish to subscribe to this list, please send a message to:
115+
You can subscribe to this list via the Web interface at
116116

117-
caml-list-request@inria.fr
118-
119-
with the single word "subscribe" in the body of the message.
117+
http://yquem.inria.fr/cgi-bin/mailman/listinfo/caml-list
120118

121119
Archives of the list are available on the Web site http://caml.inria.fr/
122120

@@ -126,11 +124,7 @@ including Caml.
126124

127125
BUG REPORTS AND USER FEEDBACK:
128126

129-
Send your bug reports by E-mail to:
130-
131-
caml-bugs@inria.fr
132-
133-
or report them using the Web interface to the bug-tracking system
127+
Please report bugs using the Web interface to the bug-tracking system
134128
at http://caml.inria.fr/bin/caml-bugs
135129

136130
To be effective, bug reports should include a complete program
@@ -139,3 +133,6 @@ configuration you are using (machine type, etc).
139133

140134
You can also contact the implementors directly at caml@inria.fr.
141135

136+
137+
----
138+
$Id$

0 commit comments

Comments
 (0)