cfa350c merge generative functors

Authored and Committed by Jacques Garrigue 10 years ago
43 files changed. 269 lines added. 83 lines removed.
Changes
file modified
+4 -0
boot/ocamlc
file modified
+0 -0
boot/ocamldep
file modified
+0 -0
boot/ocamllex
file modified
+0 -0
ocamldoc/odoc_ast.ml
file modified
+12 -5
ocamldoc/odoc_env.ml
file modified
+1 -1
ocamldoc/odoc_html.ml
file modified
+2 -1
ocamldoc/odoc_info.mli
file modified
+1 -1
ocamldoc/odoc_man.ml
file modified
+1 -1
ocamldoc/odoc_module.ml
file modified
+1 -1
ocamldoc/odoc_print.ml
file modified
+1 -1
ocamldoc/odoc_sig.ml
file modified
+23 -10
ocamldoc/odoc_to_text.ml
file modified
+5 -2
parsing/ast_helper.mli
file modified
+4 -2
parsing/ast_mapper.ml
file modified
+4 -2
parsing/parser.mly
file modified
+15 -4
parsing/parsetree.mli
file modified
+2 -2
parsing/pprintast.ml
file modified
+8 -3
parsing/printast.ml
file modified
+2 -2
testsuite/tests/typing-modules/generative.ml
file added
+26
testsuite/tests/typing-modules/generative.ml.reference
file added
+40
tools/depend.ml
file modified
+3 -2
tools/tast_iter.ml
file modified
+2 -2
tools/untypeast.ml
file modified
+2 -2
typing/btype.ml
file modified
+3 -0
typing/btype.mli
file modified
+3 -0
typing/env.ml
file modified
+4 -4
typing/includemod.ml
file modified
+7 -1
typing/mtype.ml
file modified
+36 -3
typing/mtype.mli
file modified
+1 -0
typing/oprint.ml
file modified
+3 -1
typing/outcometree.mli
file modified
+1 -1
typing/printtyp.ml
file modified
+6 -3
typing/printtyped.ml
file modified
+2 -2
typing/subst.ml
file modified
+2 -2
typing/typedtree.ml
file modified
+2 -2
typing/typedtree.mli
file modified
+2 -2
typing/typedtreeIter.ml
file modified
+2 -2
typing/typedtreeMap.ml
file modified
+2 -2
typing/typemod.ml
file modified
+31 -12
typing/typemod.mli
file modified
+1 -0
typing/types.ml
file modified
+1 -1
typing/types.mli
file modified
+1 -1
    merge generative functors
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14365 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
    
        
file modified
+4 -0
file modified
+0 -0
file modified
+0 -0
file modified
+0 -0
file modified
+12 -5
file modified
+1 -1
file modified
+2 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+23 -10
file modified
+5 -2
file modified
+4 -2
file modified
+4 -2
file modified
+15 -4
file modified
+2 -2
file modified
+8 -3
file modified
+2 -2
file modified
+3 -2
file modified
+2 -2
file modified
+2 -2
file modified
+3 -0
file modified
+3 -0
file modified
+4 -4
file modified
+7 -1
file modified
+36 -3
file modified
+1 -0
file modified
+3 -1
file modified
+1 -1
file modified
+6 -3
file modified
+2 -2
file modified
+2 -2
file modified
+2 -2
file modified
+2 -2
file modified
+2 -2
file modified
+2 -2
file modified
+31 -12
file modified
+1 -0
file modified
+1 -1
file modified
+1 -1