26e1ff7 Merge short-paths into a fresh branch of trunk.

Merged and Committed by Jacques Garrigue 11 years ago
67 files changed. 815 lines added. 806 lines removed.
driver/compile.ml
file modified
+6 -4
driver/errors.ml
file modified
+8 -8
driver/main.ml
file modified
+1 -0
driver/main_args.ml
file modified
+12 -0
driver/main_args.mli
file modified
+4 -0
driver/opterrors.ml
file modified
+8 -8
driver/optmain.ml
file modified
+1 -0
ocamldoc/odoc_analyse.ml
file modified
+8 -8
otherlibs/labltk/browser/searchid.ml
file modified
+2 -2
otherlibs/labltk/browser/searchpos.ml
file modified
+16 -12
otherlibs/labltk/browser/typecheck.ml
file modified
+8 -8
testsuite/tests/typing-gadts/dynamic_frisch.ml.principal.reference
file modified
+1 -0
testsuite/tests/typing-gadts/dynamic_frisch.ml.reference
file modified
+1 -0
testsuite/tests/typing-gadts/test.ml.principal.reference
file modified
+3 -0
testsuite/tests/typing-gadts/test.ml.reference
file modified
+3 -0
testsuite/tests/typing-misc/Makefile
file removed
-15
testsuite/tests/typing-misc/constraints.ml
file removed
-16
testsuite/tests/typing-misc/constraints.ml.reference
file removed
-29
testsuite/tests/typing-misc/labels.ml
file removed
-4
testsuite/tests/typing-misc/labels.ml.principal.reference
file removed
-8
testsuite/tests/typing-misc/labels.ml.reference
file removed
-8
testsuite/tests/typing-misc/occur_check.ml
file removed
-5
testsuite/tests/typing-misc/occur_check.ml.reference
file removed
-15
testsuite/tests/typing-misc/polyvars.ml
file removed
-7
testsuite/tests/typing-misc/polyvars.ml.principal.reference
file removed
-32
testsuite/tests/typing-misc/polyvars.ml.reference
file removed
-32
testsuite/tests/typing-misc/records.ml
file removed
-38
testsuite/tests/typing-misc/records.ml.principal.reference
file removed
-54
testsuite/tests/typing-misc/records.ml.reference
file removed
-54
testsuite/tests/typing-misc/short-paths.ml
file added
+21
testsuite/tests/typing-objects/Exemples.ml.principal.reference
file modified
+6 -6
testsuite/tests/typing-objects/Exemples.ml.reference
file modified
+6 -6
testsuite/tests/typing-objects/Tests.ml.principal.reference
file modified
+2 -0
testsuite/tests/typing-objects/Tests.ml.reference
file modified
+2 -0
testsuite/tests/typing-poly/poly.ml.principal.reference
file modified
+6 -1
testsuite/tests/typing-poly/poly.ml.reference
file modified
+6 -1
tools/ocamlcp.ml
file modified
+1 -0
tools/ocamloptp.ml
file modified
+1 -0
toplevel/opttopmain.ml
file modified
+1 -0
toplevel/toploop.ml
file modified
+8 -7
toplevel/topmain.ml
file modified
+1 -0
typing/btype.ml
file modified
+6 -0
typing/btype.mli
file modified
+1 -0
typing/ctype.ml
file modified
+16 -16
typing/ctype.mli
file modified
+5 -5
typing/env.ml
file modified
+35 -0
typing/env.mli
file modified
+4 -0
typing/ident.ml
file modified
+5 -0
typing/ident.mli
file modified
+2 -0
typing/includeclass.ml
file modified
+19 -20
typing/includemod.ml
file modified
+22 -17
typing/includemod.mli
file modified
+1 -1
typing/printtyp.ml
file modified
+245 -73
typing/printtyp.mli
file modified
+10 -8
typing/stypes.ml
file modified
+3 -3
typing/typeclass.ml
file modified
+57 -49
typing/typeclass.mli
file modified
+2 -2
typing/typecore.ml
file modified
+82 -73
typing/typecore.mli
file modified
+3 -3
typing/typedecl.ml
file modified
+10 -10
typing/typedecl.mli
file modified
+2 -2
typing/typemod.ml
file modified
+38 -27
typing/typemod.mli
file modified
+2 -2
typing/typetexp.ml
file modified
+72 -79
typing/typetexp.mli
file modified
+28 -28
utils/clflags.ml
file modified
+1 -0
utils/clflags.mli
file modified
+1 -0
    Merge short-paths into a fresh branch of trunk.
    Also fix a bit unification and subtyping errors.
    You now need the flag -short-path to activate short paths.
    
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+6 -4
file modified
+8 -8
file modified
+1 -0
file modified
+12 -0
file modified
+4 -0
file modified
+8 -8
file modified
+1 -0
file modified
+8 -8
file modified
+1 -0
file modified
+1 -0
file modified
+1 -0
file modified
+8 -7
file modified
+1 -0
file modified
+6 -0
file modified
+1 -0
file modified
+16 -16
file modified
+5 -5
file modified
+35 -0
file modified
+4 -0
file modified
+5 -0
file modified
+2 -0
file modified
+19 -20
file modified
+22 -17
file modified
+1 -1
file modified
+245 -73
file modified
+10 -8
file modified
+3 -3
file modified
+57 -49
file modified
+2 -2
file modified
+82 -73
file modified
+3 -3
file modified
+10 -10
file modified
+2 -2
file modified
+38 -27
file modified
+2 -2
file modified
+72 -79
file modified
+28 -28
file modified
+1 -0
file modified
+1 -0