5f68db9 Merge trunk at revision 14200. Now everything works except private types

Merged and Committed by Jacques Garrigue 10 years ago
44 files changed. 837 lines added. 589 lines removed.
.depend
file modified
+70 -100
boot/ocamlc
file modified
+0 -0
boot/ocamldep
file modified
+0 -0
boot/ocamllex
file modified
+0 -0
bytecomp/translmod.ml
file modified
+3 -3
bytecomp/typeopt.ml
file modified
+2 -2
debugger/eval.ml
file modified
+3 -3
ocamldoc/Makefile.nt
file modified
+1 -0
ocamldoc/odoc_ast.ml
file modified
+2 -2
ocamldoc/odoc_env.ml
file modified
+2 -2
ocamldoc/odoc_print.ml
file modified
+4 -4
ocamldoc/odoc_sig.ml
file modified
+5 -5
testsuite/tests/asmcomp/Makefile
file modified
+1 -0
testsuite/tests/typing-gadts/test.ml.principal.reference
file modified
+1 -1
testsuite/tests/typing-gadts/test.ml.reference
file modified
+1 -1
testsuite/tests/typing-modules/aliases.ml
file modified
+2 -0
testsuite/tests/typing-short-paths/short-paths.ml.reference
file modified
+1 -46
tools/untypeast.ml
file modified
+3 -1
toplevel/genprintval.ml
file modified
+7 -7
toplevel/toploop.ml
file modified
+2 -2
typing/btype.ml
file modified
+6 -6
typing/ctype.ml
file modified
+84 -65
typing/datarepr.ml
file modified
+36 -25
typing/datarepr.mli
file modified
+4 -4
typing/env.ml
file modified
+42 -28
typing/env.mli
file modified
+7 -4
typing/envaux.ml
file modified
+8 -6
typing/includecore.ml
file modified
+10 -8
typing/includemod.ml
file modified
+2 -2
typing/mtype.ml
file modified
+29 -17
typing/mtype.mli
file modified
+1 -0
typing/parmatch.ml
file modified
+3 -3
typing/predef.ml
file modified
+19 -7
typing/printtyp.ml
file modified
+34 -29
typing/subst.ml
file modified
+54 -21
typing/subst.mli
file modified
+1 -0
typing/typeclass.ml
file modified
+85 -55
typing/typecore.ml
file modified
+7 -11
typing/typedecl.ml
file modified
+46 -35
typing/typemod.ml
file modified
+88 -42
typing/types.ml
file modified
+53 -14
typing/types.mli
file modified
+55 -15
typing/typetexp.ml
file modified
+47 -10
typing/typetexp.mli
file modified
+6 -3
    Merge trunk at revision 14200. Now everything works except private types
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/branches/module-alias@14201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+70 -100
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+3 -3
file modified
+2 -2
file modified
+3 -3
file modified
+1 -0
file modified
+2 -2
file modified
+2 -2
file modified
+4 -4
file modified
+5 -5
file modified
+3 -1
file modified
+7 -7
file modified
+2 -2
file modified
+6 -6
file modified
+84 -65
file modified
+36 -25
file modified
+4 -4
file modified
+42 -28
file modified
+7 -4
file modified
+8 -6
file modified
+10 -8
file modified
+2 -2
file modified
+29 -17
file modified
+1 -0
file modified
+3 -3
file modified
+19 -7
file modified
+34 -29
file modified
+54 -21
file modified
+1 -0
file modified
+85 -55
file modified
+7 -11
file modified
+46 -35
file modified
+88 -42
file modified
+53 -14
file modified
+55 -15
file modified
+47 -10
file modified
+6 -3