3b4d7cf Merge module-alias branch (cf. PR#6063)

Merged and Committed by Jacques Garrigue 10 years ago
79 files changed. 1179 lines added. 443 lines removed.
.depend
file modified
+4 -4
Changes
file modified
+8 -4
boot/ocamlc
file modified
+0 -0
boot/ocamldep
file modified
+0 -0
boot/ocamllex
file modified
+0 -0
bytecomp/lambda.ml
file modified
+9 -4
bytecomp/lambda.mli
file modified
+3 -2
bytecomp/matching.ml
file modified
+4 -2
bytecomp/printlambda.ml
file modified
+5 -2
bytecomp/translclass.ml
file modified
+13 -9
bytecomp/translcore.ml
file modified
+11 -9
bytecomp/translmod.ml
file modified
+81 -39
bytecomp/translobj.ml
file modified
+8 -1
debugger/printval.ml
file modified
+2 -2
driver/compenv.ml
file modified
+1 -0
driver/main.ml
file modified
+1 -0
driver/main_args.ml
file modified
+12 -0
driver/main_args.mli
file modified
+4 -0
driver/optmain.ml
file modified
+1 -0
ocamldoc/odoc_env.ml
file modified
+1 -0
ocamldoc/odoc_print.ml
file modified
+1 -0
ocamldoc/odoc_sig.ml
file modified
+14 -1
parsing/ast_helper.ml
file modified
+1 -0
parsing/ast_helper.mli
file modified
+1 -0
parsing/ast_mapper.ml
file modified
+7 -3
parsing/parser.mly
file modified
+8 -1
parsing/parsetree.mli
file modified
+2 -0
parsing/pprintast.ml
file modified
+11 -3
parsing/printast.ml
file modified
+1 -0
stdlib/Compflags
file modified
+1 -4
stdlib/stdLabels.mli
file modified
+3 -120
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-bugs/gatien_baron_20131019_ok.ml
file added
+31
testsuite/tests/typing-modules/a.mli
file added
+3
testsuite/tests/typing-modules/aliases.ml
file added
+132
testsuite/tests/typing-modules/aliases.ml.reference
file added
+264
testsuite/tests/typing-modules/b.ml
file added
+18
testsuite/tests/typing-modules/b2.ml
file added
+14
testsuite/tests/typing-modules/b3.mli
file added
+4
testsuite/tests/typing-modules/d.ml
file added
+2
testsuite/tests/typing-private/private.ml.reference
file modified
+1 -1
testsuite/tests/typing-recmod/t19ok.ml
file modified
+5 -2
testsuite/tests/typing-short-paths/short-paths.ml.reference
file modified
+1 -46
tools/depend.ml
file modified
+1 -0
tools/ocamlcp.ml
file modified
+1 -0
tools/ocamloptp.ml
file modified
+1 -0
tools/tast_iter.ml
file modified
+1 -0
tools/untypeast.ml
file modified
+1 -0
toplevel/genprintval.ml
file modified
+2 -2
toplevel/genprintval.mli
file modified
+1 -1
toplevel/topdirs.ml
file modified
+2 -2
toplevel/toploop.ml
file modified
+4 -1
toplevel/toploop.mli
file modified
+1 -1
toplevel/topmain.ml
file modified
+1 -0
typing/ctype.ml
file modified
+5 -6
typing/env.ml
file modified
+209 -83
typing/env.mli
file modified
+23 -6
typing/envaux.ml
file modified
+4 -0
typing/includemod.ml
file modified
+49 -8
typing/includemod.mli
file modified
+2 -0
typing/mtype.ml
file modified
+11 -1
typing/oprint.ml
file modified
+3 -0
typing/outcometree.mli
file modified
+1 -0
typing/printtyp.ml
file modified
+19 -23
typing/printtyped.ml
file modified
+2 -1
typing/subst.ml
file modified
+2 -0
typing/typecore.ml
file modified
+5 -2
typing/typedtree.ml
file modified
+4 -1
typing/typedtree.mli
file modified
+4 -1
typing/typedtreeIter.ml
file modified
+1 -0
typing/typedtreeMap.ml
file modified
+2 -1
typing/typemod.ml
file modified
+113 -38
typing/types.ml
file modified
+1 -0
typing/types.mli
file modified
+1 -0
typing/typetexp.ml
file modified
+4 -3
typing/typetexp.mli
file modified
+1 -1
utils/clflags.ml
file modified
+1 -0
utils/clflags.mli
file modified
+1 -0
    Merge module-alias branch (cf. PR#6063)
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14394 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+4 -4
file modified
+8 -4
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+9 -4
file modified
+3 -2
file modified
+4 -2
file modified
+5 -2
file modified
+13 -9
file modified
+11 -9
file modified
+81 -39
file modified
+8 -1
file modified
+2 -2
file modified
+1 -0
file modified
+1 -0
file modified
+12 -0
file modified
+4 -0
file modified
+1 -0
file modified
+1 -0
file modified
+1 -0
file modified
+14 -1
file modified
+1 -0
file modified
+1 -0
file modified
+7 -3
file modified
+8 -1
file modified
+2 -0
file modified
+11 -3
file modified
+1 -0
file modified
+1 -4
file modified
+3 -120
file modified
+1 -0
file modified
+1 -0
file modified
+1 -0
file modified
+1 -0
file modified
+1 -0
file modified
+2 -2
file modified
+1 -1
file modified
+2 -2
file modified
+4 -1
file modified
+1 -1
file modified
+1 -0
file modified
+5 -6
file modified
+209 -83
file modified
+23 -6
file modified
+4 -0
file modified
+49 -8
file modified
+2 -0
file modified
+11 -1
file modified
+3 -0
file modified
+1 -0
file modified
+19 -23
file modified
+2 -1
file modified
+2 -0
file modified
+5 -2
file modified
+4 -1
file modified
+4 -1
file modified
+1 -0
file modified
+2 -1
file modified
+113 -38
file modified
+1 -0
file modified
+1 -0
file modified
+4 -3
file modified
+1 -1
file modified
+1 -0
file modified
+1 -0