Imported Upstream version 3.08.3

diff --git a/.depend b/.depend
index b6af556a7cef6f557df6290a7c7fdace1dc3b4f3..0669641a9414476ab517b5f35bf544fdc4eafc80 100644 (file)
--- a/.depend
+++ b/.depend
@@ -1,6 +1,6 @@
-utils/ccomp.cmo: utils/clflags.cmo utils/config.cmi utils/misc.cmi \
+utils/ccomp.cmo: utils/misc.cmi utils/config.cmi utils/clflags.cmo \
     utils/ccomp.cmi 
-utils/ccomp.cmx: utils/clflags.cmx utils/config.cmx utils/misc.cmx \
+utils/ccomp.cmx: utils/misc.cmx utils/config.cmx utils/clflags.cmx \
     utils/ccomp.cmi 
 utils/clflags.cmo: utils/config.cmi 
 utils/clflags.cmx: utils/config.cmx 
@@ -16,763 +16,757 @@ utils/terminfo.cmo: utils/terminfo.cmi
 utils/terminfo.cmx: utils/terminfo.cmi 
 utils/warnings.cmo: utils/warnings.cmi 
 utils/warnings.cmx: utils/warnings.cmi 
-parsing/lexer.cmi: parsing/location.cmi parsing/parser.cmi 
+parsing/lexer.cmi: parsing/parser.cmi parsing/location.cmi 
 parsing/location.cmi: utils/warnings.cmi 
 parsing/parse.cmi: parsing/parsetree.cmi 
 parsing/parser.cmi: parsing/parsetree.cmi 
-parsing/parsetree.cmi: parsing/asttypes.cmi parsing/location.cmi \
-    parsing/longident.cmi 
+parsing/parsetree.cmi: parsing/longident.cmi parsing/location.cmi \
+    parsing/asttypes.cmi 
 parsing/printast.cmi: parsing/parsetree.cmi 
 parsing/syntaxerr.cmi: parsing/location.cmi 
-parsing/lexer.cmo: parsing/location.cmi utils/misc.cmi parsing/parser.cmi \
-    utils/warnings.cmi parsing/lexer.cmi 
-parsing/lexer.cmx: parsing/location.cmx utils/misc.cmx parsing/parser.cmx \
-    utils/warnings.cmx parsing/lexer.cmi 
+parsing/lexer.cmo: utils/warnings.cmi parsing/parser.cmi utils/misc.cmi \
+    parsing/location.cmi parsing/lexer.cmi 
+parsing/lexer.cmx: utils/warnings.cmx parsing/parser.cmx utils/misc.cmx \
+    parsing/location.cmx parsing/lexer.cmi 
 parsing/linenum.cmo: utils/misc.cmi parsing/linenum.cmi 
 parsing/linenum.cmx: utils/misc.cmx parsing/linenum.cmi 
-parsing/location.cmo: parsing/linenum.cmi utils/terminfo.cmi \
-    utils/warnings.cmi parsing/location.cmi 
-parsing/location.cmx: parsing/linenum.cmx utils/terminfo.cmx \
-    utils/warnings.cmx parsing/location.cmi 
+parsing/location.cmo: utils/warnings.cmi utils/terminfo.cmi \
+    parsing/linenum.cmi parsing/location.cmi 
+parsing/location.cmx: utils/warnings.cmx utils/terminfo.cmx \
+    parsing/linenum.cmx parsing/location.cmi 
 parsing/longident.cmo: utils/misc.cmi parsing/longident.cmi 
 parsing/longident.cmx: utils/misc.cmx parsing/longident.cmi 
-parsing/parse.cmo: parsing/lexer.cmi parsing/location.cmi parsing/parser.cmi \
-    parsing/syntaxerr.cmi parsing/parse.cmi 
-parsing/parse.cmx: parsing/lexer.cmx parsing/location.cmx parsing/parser.cmx \
-    parsing/syntaxerr.cmx parsing/parse.cmi 
-parsing/parser.cmo: parsing/asttypes.cmi utils/clflags.cmo \
-    parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi \
-    parsing/syntaxerr.cmi parsing/parser.cmi 
-parsing/parser.cmx: parsing/asttypes.cmi utils/clflags.cmx \
-    parsing/location.cmx parsing/longident.cmx parsing/parsetree.cmi \
-    parsing/syntaxerr.cmx parsing/parser.cmi 
-parsing/printast.cmo: parsing/asttypes.cmi parsing/location.cmi \
-    parsing/longident.cmi parsing/parsetree.cmi parsing/printast.cmi 
-parsing/printast.cmx: parsing/asttypes.cmi parsing/location.cmx \
-    parsing/longident.cmx parsing/parsetree.cmi parsing/printast.cmi 
+parsing/parse.cmo: parsing/syntaxerr.cmi parsing/parser.cmi \
+    parsing/location.cmi parsing/lexer.cmi parsing/parse.cmi 
+parsing/parse.cmx: parsing/syntaxerr.cmx parsing/parser.cmx \
+    parsing/location.cmx parsing/lexer.cmx parsing/parse.cmi 
+parsing/parser.cmo: parsing/syntaxerr.cmi parsing/parsetree.cmi \
+    parsing/longident.cmi parsing/location.cmi utils/clflags.cmo \
+    parsing/asttypes.cmi parsing/parser.cmi 
+parsing/parser.cmx: parsing/syntaxerr.cmx parsing/parsetree.cmi \
+    parsing/longident.cmx parsing/location.cmx utils/clflags.cmx \
+    parsing/asttypes.cmi parsing/parser.cmi 
+parsing/printast.cmo: parsing/parsetree.cmi parsing/longident.cmi \
+    parsing/location.cmi parsing/asttypes.cmi parsing/printast.cmi 
+parsing/printast.cmx: parsing/parsetree.cmi parsing/longident.cmx \
+    parsing/location.cmx parsing/asttypes.cmi parsing/printast.cmi 
 parsing/syntaxerr.cmo: parsing/location.cmi parsing/syntaxerr.cmi 
 parsing/syntaxerr.cmx: parsing/location.cmx parsing/syntaxerr.cmi 
-typing/btype.cmi: parsing/asttypes.cmi typing/path.cmi typing/types.cmi 
-typing/ctype.cmi: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    typing/path.cmi typing/types.cmi 
-typing/datarepr.cmi: parsing/asttypes.cmi typing/path.cmi typing/types.cmi 
-typing/env.cmi: utils/consistbl.cmi typing/ident.cmi parsing/longident.cmi \
-    typing/path.cmi typing/types.cmi 
-typing/includeclass.cmi: typing/ctype.cmi typing/env.cmi typing/typedtree.cmi \
-    typing/types.cmi 
-typing/includecore.cmi: typing/env.cmi typing/ident.cmi typing/typedtree.cmi \
-    typing/types.cmi 
-typing/includemod.cmi: typing/ctype.cmi typing/env.cmi typing/ident.cmi \
-    typing/typedtree.cmi typing/types.cmi 
-typing/mtype.cmi: typing/env.cmi typing/ident.cmi typing/path.cmi \
-    typing/types.cmi 
+typing/btype.cmi: typing/types.cmi typing/path.cmi parsing/asttypes.cmi 
+typing/ctype.cmi: typing/types.cmi typing/path.cmi typing/ident.cmi \
+    typing/env.cmi parsing/asttypes.cmi 
+typing/datarepr.cmi: typing/types.cmi typing/path.cmi parsing/asttypes.cmi 
+typing/env.cmi: typing/types.cmi typing/path.cmi parsing/longident.cmi \
+    typing/ident.cmi utils/consistbl.cmi 
+typing/includeclass.cmi: typing/types.cmi typing/typedtree.cmi typing/env.cmi \
+    typing/ctype.cmi 
+typing/includecore.cmi: typing/types.cmi typing/typedtree.cmi \
+    typing/ident.cmi typing/env.cmi 
+typing/includemod.cmi: typing/types.cmi typing/typedtree.cmi typing/ident.cmi \
+    typing/env.cmi typing/ctype.cmi 
+typing/mtype.cmi: typing/types.cmi typing/path.cmi typing/ident.cmi \
+    typing/env.cmi 
 typing/oprint.cmi: typing/outcometree.cmi 
 typing/outcometree.cmi: parsing/asttypes.cmi 
-typing/parmatch.cmi: typing/env.cmi parsing/location.cmi typing/typedtree.cmi \
-    typing/types.cmi 
+typing/parmatch.cmi: typing/types.cmi typing/typedtree.cmi \
+    parsing/location.cmi typing/env.cmi 
 typing/path.cmi: typing/ident.cmi 
-typing/predef.cmi: typing/ident.cmi typing/path.cmi typing/types.cmi 
-typing/printtyp.cmi: typing/ident.cmi parsing/longident.cmi \
-    typing/outcometree.cmi typing/path.cmi typing/types.cmi 
-typing/stypes.cmi: parsing/location.cmi typing/typedtree.cmi 
-typing/subst.cmi: typing/ident.cmi typing/path.cmi typing/types.cmi 
-typing/typeclass.cmi: parsing/asttypes.cmi typing/ctype.cmi typing/env.cmi \
-    typing/ident.cmi parsing/location.cmi parsing/longident.cmi \
-    parsing/parsetree.cmi typing/typedtree.cmi typing/types.cmi 
-typing/typecore.cmi: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi \
-    typing/path.cmi typing/typedtree.cmi typing/types.cmi 
-typing/typedecl.cmi: typing/env.cmi typing/ident.cmi parsing/location.cmi \
-    parsing/longident.cmi parsing/parsetree.cmi typing/path.cmi \
-    typing/types.cmi 
-typing/typedtree.cmi: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    parsing/location.cmi typing/path.cmi typing/primitive.cmi \
-    typing/types.cmi 
-typing/typemod.cmi: typing/env.cmi typing/ident.cmi typing/includemod.cmi \
-    parsing/location.cmi parsing/longident.cmi parsing/parsetree.cmi \
-    typing/typedtree.cmi typing/types.cmi 
-typing/types.cmi: parsing/asttypes.cmi typing/ident.cmi typing/path.cmi \
-    typing/primitive.cmi 
-typing/typetexp.cmi: typing/env.cmi parsing/location.cmi \
-    parsing/longident.cmi parsing/parsetree.cmi typing/path.cmi \
-    typing/types.cmi 
-typing/btype.cmo: utils/misc.cmi typing/path.cmi typing/types.cmi \
+typing/predef.cmi: typing/types.cmi typing/path.cmi typing/ident.cmi 
+typing/printtyp.cmi: typing/types.cmi typing/path.cmi typing/outcometree.cmi \
+    parsing/longident.cmi typing/ident.cmi 
+typing/stypes.cmi: typing/typedtree.cmi parsing/location.cmi 
+typing/subst.cmi: typing/types.cmi typing/path.cmi typing/ident.cmi 
+typing/typeclass.cmi: typing/types.cmi typing/typedtree.cmi \
+    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi parsing/asttypes.cmi 
+typing/typecore.cmi: typing/types.cmi typing/typedtree.cmi typing/path.cmi \
+    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
+    typing/ident.cmi typing/env.cmi parsing/asttypes.cmi 
+typing/typedecl.cmi: typing/types.cmi typing/path.cmi parsing/parsetree.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/ident.cmi \
+    typing/env.cmi 
+typing/typedtree.cmi: typing/types.cmi typing/primitive.cmi typing/path.cmi \
+    parsing/location.cmi typing/ident.cmi typing/env.cmi parsing/asttypes.cmi 
+typing/typemod.cmi: typing/types.cmi typing/typedtree.cmi \
+    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
+    typing/includemod.cmi typing/ident.cmi typing/env.cmi 
+typing/types.cmi: typing/primitive.cmi typing/path.cmi typing/ident.cmi \
+    parsing/asttypes.cmi 
+typing/typetexp.cmi: typing/types.cmi typing/path.cmi parsing/parsetree.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/env.cmi 
+typing/btype.cmo: typing/types.cmi typing/path.cmi utils/misc.cmi \
     typing/btype.cmi 
-typing/btype.cmx: utils/misc.cmx typing/path.cmx typing/types.cmx \
+typing/btype.cmx: typing/types.cmx typing/path.cmx utils/misc.cmx \
     typing/btype.cmi 
-typing/ctype.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    typing/env.cmi typing/ident.cmi parsing/longident.cmi utils/misc.cmi \
-    typing/path.cmi typing/subst.cmi typing/types.cmi typing/ctype.cmi 
-typing/ctype.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
-    typing/env.cmx typing/ident.cmx parsing/longident.cmx utils/misc.cmx \
-    typing/path.cmx typing/subst.cmx typing/types.cmx typing/ctype.cmi 
-typing/datarepr.cmo: parsing/asttypes.cmi utils/misc.cmi typing/predef.cmi \
-    typing/types.cmi typing/datarepr.cmi 
-typing/datarepr.cmx: parsing/asttypes.cmi utils/misc.cmx typing/predef.cmx \
-    typing/types.cmx typing/datarepr.cmi 
-typing/env.cmo: parsing/asttypes.cmi typing/btype.cmi utils/config.cmi \
-    utils/consistbl.cmi typing/datarepr.cmi typing/ident.cmi \
-    parsing/longident.cmi utils/misc.cmi typing/path.cmi typing/predef.cmi \
-    typing/subst.cmi utils/tbl.cmi typing/types.cmi typing/env.cmi 
-typing/env.cmx: parsing/asttypes.cmi typing/btype.cmx utils/config.cmx \
-    utils/consistbl.cmx typing/datarepr.cmx typing/ident.cmx \
-    parsing/longident.cmx utils/misc.cmx typing/path.cmx typing/predef.cmx \
-    typing/subst.cmx utils/tbl.cmx typing/types.cmx typing/env.cmi 
+typing/ctype.cmo: typing/types.cmi typing/subst.cmi typing/path.cmi \
+    utils/misc.cmi parsing/longident.cmi typing/ident.cmi typing/env.cmi \
+    utils/clflags.cmo typing/btype.cmi parsing/asttypes.cmi typing/ctype.cmi 
+typing/ctype.cmx: typing/types.cmx typing/subst.cmx typing/path.cmx \
+    utils/misc.cmx parsing/longident.cmx typing/ident.cmx typing/env.cmx \
+    utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi typing/ctype.cmi 
+typing/datarepr.cmo: typing/types.cmi typing/predef.cmi utils/misc.cmi \
+    parsing/asttypes.cmi typing/datarepr.cmi 
+typing/datarepr.cmx: typing/types.cmx typing/predef.cmx utils/misc.cmx \
+    parsing/asttypes.cmi typing/datarepr.cmi 
+typing/env.cmo: typing/types.cmi utils/tbl.cmi typing/subst.cmi \
+    typing/predef.cmi typing/path.cmi utils/misc.cmi parsing/longident.cmi \
+    typing/ident.cmi typing/datarepr.cmi utils/consistbl.cmi utils/config.cmi \
+    typing/btype.cmi parsing/asttypes.cmi typing/env.cmi 
+typing/env.cmx: typing/types.cmx utils/tbl.cmx typing/subst.cmx \
+    typing/predef.cmx typing/path.cmx utils/misc.cmx parsing/longident.cmx \
+    typing/ident.cmx typing/datarepr.cmx utils/consistbl.cmx utils/config.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/env.cmi 
 typing/ident.cmo: typing/ident.cmi 
 typing/ident.cmx: typing/ident.cmi 
-typing/includeclass.cmo: typing/ctype.cmi typing/printtyp.cmi \
-    typing/types.cmi typing/includeclass.cmi 
-typing/includeclass.cmx: typing/ctype.cmx typing/printtyp.cmx \
-    typing/types.cmx typing/includeclass.cmi 
-typing/includecore.cmo: parsing/asttypes.cmi typing/btype.cmi \
-    typing/ctype.cmi utils/misc.cmi typing/path.cmi typing/predef.cmi \
-    typing/typedtree.cmi typing/types.cmi typing/includecore.cmi 
-typing/includecore.cmx: parsing/asttypes.cmi typing/btype.cmx \
-    typing/ctype.cmx utils/misc.cmx typing/path.cmx typing/predef.cmx \
-    typing/typedtree.cmx typing/types.cmx typing/includecore.cmi 
-typing/includemod.cmo: typing/ctype.cmi typing/env.cmi typing/ident.cmi \
-    typing/includeclass.cmi typing/includecore.cmi utils/misc.cmi \
-    typing/mtype.cmi typing/path.cmi typing/printtyp.cmi typing/subst.cmi \
-    utils/tbl.cmi typing/typedtree.cmi typing/types.cmi typing/includemod.cmi 
-typing/includemod.cmx: typing/ctype.cmx typing/env.cmx typing/ident.cmx \
-    typing/includeclass.cmx typing/includecore.cmx utils/misc.cmx \
-    typing/mtype.cmx typing/path.cmx typing/printtyp.cmx typing/subst.cmx \
-    utils/tbl.cmx typing/typedtree.cmx typing/types.cmx typing/includemod.cmi 
-typing/mtype.cmo: typing/btype.cmi typing/ctype.cmi typing/env.cmi \
-    typing/ident.cmi typing/path.cmi typing/subst.cmi typing/types.cmi \
+typing/includeclass.cmo: typing/types.cmi typing/printtyp.cmi \
+    typing/ctype.cmi typing/includeclass.cmi 
+typing/includeclass.cmx: typing/types.cmx typing/printtyp.cmx \
+    typing/ctype.cmx typing/includeclass.cmi 
+typing/includecore.cmo: typing/types.cmi typing/typedtree.cmi \
+    typing/predef.cmi typing/path.cmi utils/misc.cmi typing/ctype.cmi \
+    typing/btype.cmi parsing/asttypes.cmi typing/includecore.cmi 
+typing/includecore.cmx: typing/types.cmx typing/typedtree.cmx \
+    typing/predef.cmx typing/path.cmx utils/misc.cmx typing/ctype.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/includecore.cmi 
+typing/includemod.cmo: typing/types.cmi typing/typedtree.cmi utils/tbl.cmi \
+    typing/subst.cmi typing/printtyp.cmi typing/path.cmi typing/mtype.cmi \
+    utils/misc.cmi typing/includecore.cmi typing/includeclass.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi typing/includemod.cmi 
+typing/includemod.cmx: typing/types.cmx typing/typedtree.cmx utils/tbl.cmx \
+    typing/subst.cmx typing/printtyp.cmx typing/path.cmx typing/mtype.cmx \
+    utils/misc.cmx typing/includecore.cmx typing/includeclass.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx typing/includemod.cmi 
+typing/mtype.cmo: typing/types.cmi typing/subst.cmi typing/path.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi typing/btype.cmi \
     typing/mtype.cmi 
-typing/mtype.cmx: typing/btype.cmx typing/ctype.cmx typing/env.cmx \
-    typing/ident.cmx typing/path.cmx typing/subst.cmx typing/types.cmx \
+typing/mtype.cmx: typing/types.cmx typing/subst.cmx typing/path.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx typing/btype.cmx \
     typing/mtype.cmi 
-typing/oprint.cmo: parsing/asttypes.cmi typing/outcometree.cmi \
+typing/oprint.cmo: typing/outcometree.cmi parsing/asttypes.cmi \
     typing/oprint.cmi 
-typing/oprint.cmx: parsing/asttypes.cmi typing/outcometree.cmi \
+typing/oprint.cmx: typing/outcometree.cmi parsing/asttypes.cmi \
     typing/oprint.cmi 
-typing/parmatch.cmo: parsing/asttypes.cmi typing/btype.cmi typing/ctype.cmi \
-    typing/datarepr.cmi typing/env.cmi typing/ident.cmi parsing/location.cmi \
-    utils/misc.cmi typing/path.cmi typing/predef.cmi typing/typedtree.cmi \
-    typing/types.cmi utils/warnings.cmi typing/parmatch.cmi 
-typing/parmatch.cmx: parsing/asttypes.cmi typing/btype.cmx typing/ctype.cmx \
-    typing/datarepr.cmx typing/env.cmx typing/ident.cmx parsing/location.cmx \
-    utils/misc.cmx typing/path.cmx typing/predef.cmx typing/typedtree.cmx \
-    typing/types.cmx utils/warnings.cmx typing/parmatch.cmi 
+typing/parmatch.cmo: utils/warnings.cmi typing/types.cmi typing/typedtree.cmi \
+    typing/predef.cmi typing/path.cmi utils/misc.cmi parsing/location.cmi \
+    typing/ident.cmi typing/env.cmi typing/datarepr.cmi typing/ctype.cmi \
+    typing/btype.cmi parsing/asttypes.cmi typing/parmatch.cmi 
+typing/parmatch.cmx: utils/warnings.cmx typing/types.cmx typing/typedtree.cmx \
+    typing/predef.cmx typing/path.cmx utils/misc.cmx parsing/location.cmx \
+    typing/ident.cmx typing/env.cmx typing/datarepr.cmx typing/ctype.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/parmatch.cmi 
 typing/path.cmo: typing/ident.cmi typing/path.cmi 
 typing/path.cmx: typing/ident.cmx typing/path.cmi 
-typing/predef.cmo: parsing/asttypes.cmi typing/btype.cmi typing/ident.cmi \
-    typing/path.cmi typing/types.cmi typing/predef.cmi 
-typing/predef.cmx: parsing/asttypes.cmi typing/btype.cmx typing/ident.cmx \
-    typing/path.cmx typing/types.cmx typing/predef.cmi 
+typing/predef.cmo: typing/types.cmi typing/path.cmi typing/ident.cmi \
+    typing/btype.cmi parsing/asttypes.cmi typing/predef.cmi 
+typing/predef.cmx: typing/types.cmx typing/path.cmx typing/ident.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/predef.cmi 
 typing/primitive.cmo: utils/misc.cmi typing/primitive.cmi 
 typing/primitive.cmx: utils/misc.cmx typing/primitive.cmi 
-typing/printtyp.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    typing/ctype.cmi typing/env.cmi typing/ident.cmi parsing/longident.cmi \
-    utils/misc.cmi typing/oprint.cmi typing/outcometree.cmi typing/path.cmi \
-    typing/predef.cmi typing/primitive.cmi typing/types.cmi \
+typing/printtyp.cmo: typing/types.cmi typing/primitive.cmi typing/predef.cmi \
+    typing/path.cmi typing/outcometree.cmi typing/oprint.cmi utils/misc.cmi \
+    parsing/longident.cmi typing/ident.cmi typing/env.cmi typing/ctype.cmi \
+    utils/clflags.cmo typing/btype.cmi parsing/asttypes.cmi \
     typing/printtyp.cmi 
-typing/printtyp.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
-    typing/ctype.cmx typing/env.cmx typing/ident.cmx parsing/longident.cmx \
-    utils/misc.cmx typing/oprint.cmx typing/outcometree.cmi typing/path.cmx \
-    typing/predef.cmx typing/primitive.cmx typing/types.cmx \
+typing/printtyp.cmx: typing/types.cmx typing/primitive.cmx typing/predef.cmx \
+    typing/path.cmx typing/outcometree.cmi typing/oprint.cmx utils/misc.cmx \
+    parsing/longident.cmx typing/ident.cmx typing/env.cmx typing/ctype.cmx \
+    utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi \
     typing/printtyp.cmi 
-typing/stypes.cmo: utils/clflags.cmo parsing/location.cmi typing/printtyp.cmi \
-    typing/typedtree.cmi typing/stypes.cmi 
-typing/stypes.cmx: utils/clflags.cmx parsing/location.cmx typing/printtyp.cmx \
-    typing/typedtree.cmx typing/stypes.cmi 
-typing/subst.cmo: typing/btype.cmi typing/ident.cmi utils/misc.cmi \
-    typing/path.cmi utils/tbl.cmi typing/types.cmi typing/subst.cmi 
-typing/subst.cmx: typing/btype.cmx typing/ident.cmx utils/misc.cmx \
-    typing/path.cmx utils/tbl.cmx typing/types.cmx typing/subst.cmi 
-typing/typeclass.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    typing/ctype.cmi typing/env.cmi typing/ident.cmi typing/includeclass.cmi \
-    parsing/location.cmi parsing/longident.cmi utils/misc.cmi \
-    typing/parmatch.cmi parsing/parsetree.cmi typing/path.cmi \
-    typing/predef.cmi typing/printtyp.cmi typing/stypes.cmi typing/subst.cmi \
-    typing/typecore.cmi typing/typedecl.cmi typing/typedtree.cmi \
-    typing/types.cmi typing/typetexp.cmi utils/warnings.cmi \
-    typing/typeclass.cmi 
-typing/typeclass.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
-    typing/ctype.cmx typing/env.cmx typing/ident.cmx typing/includeclass.cmx \
-    parsing/location.cmx parsing/longident.cmx utils/misc.cmx \
-    typing/parmatch.cmx parsing/parsetree.cmi typing/path.cmx \
-    typing/predef.cmx typing/printtyp.cmx typing/stypes.cmx typing/subst.cmx \
-    typing/typecore.cmx typing/typedecl.cmx typing/typedtree.cmx \
-    typing/types.cmx typing/typetexp.cmx utils/warnings.cmx \
-    typing/typeclass.cmi 
-typing/typecore.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    typing/ctype.cmi typing/env.cmi typing/ident.cmi parsing/location.cmi \
-    parsing/longident.cmi utils/misc.cmi typing/parmatch.cmi \
-    parsing/parsetree.cmi typing/path.cmi typing/predef.cmi \
-    typing/primitive.cmi typing/printtyp.cmi typing/stypes.cmi \
-    typing/typedtree.cmi typing/types.cmi typing/typetexp.cmi \
-    utils/warnings.cmi typing/typecore.cmi 
-typing/typecore.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
-    typing/ctype.cmx typing/env.cmx typing/ident.cmx parsing/location.cmx \
-    parsing/longident.cmx utils/misc.cmx typing/parmatch.cmx \
-    parsing/parsetree.cmi typing/path.cmx typing/predef.cmx \
-    typing/primitive.cmx typing/printtyp.cmx typing/stypes.cmx \
-    typing/typedtree.cmx typing/types.cmx typing/typetexp.cmx \
-    utils/warnings.cmx typing/typecore.cmi 
-typing/typedecl.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    utils/config.cmi typing/ctype.cmi typing/env.cmi typing/ident.cmi \
-    typing/includecore.cmi parsing/location.cmi parsing/longident.cmi \
-    utils/misc.cmi parsing/parsetree.cmi typing/path.cmi typing/predef.cmi \
-    typing/primitive.cmi typing/printtyp.cmi typing/subst.cmi \
-    typing/typedtree.cmi typing/types.cmi typing/typetexp.cmi \
-    typing/typedecl.cmi 
-typing/typedecl.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
-    utils/config.cmx typing/ctype.cmx typing/env.cmx typing/ident.cmx \
-    typing/includecore.cmx parsing/location.cmx parsing/longident.cmx \
-    utils/misc.cmx parsing/parsetree.cmi typing/path.cmx typing/predef.cmx \
-    typing/primitive.cmx typing/printtyp.cmx typing/subst.cmx \
-    typing/typedtree.cmx typing/types.cmx typing/typetexp.cmx \
-    typing/typedecl.cmi 
-typing/typedtree.cmo: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    parsing/location.cmi utils/misc.cmi typing/path.cmi typing/primitive.cmi \
-    typing/types.cmi typing/typedtree.cmi 
-typing/typedtree.cmx: parsing/asttypes.cmi typing/env.cmx typing/ident.cmx \
-    parsing/location.cmx utils/misc.cmx typing/path.cmx typing/primitive.cmx \
-    typing/types.cmx typing/typedtree.cmi 
-typing/typemod.cmo: utils/clflags.cmo utils/config.cmi typing/ctype.cmi \
-    typing/env.cmi typing/ident.cmi typing/includemod.cmi \
-    parsing/location.cmi parsing/longident.cmi utils/misc.cmi \
-    typing/mtype.cmi parsing/parsetree.cmi typing/path.cmi \
-    typing/printtyp.cmi typing/stypes.cmi typing/subst.cmi \
-    typing/typeclass.cmi typing/typecore.cmi typing/typedecl.cmi \
-    typing/typedtree.cmi typing/types.cmi typing/typemod.cmi 
-typing/typemod.cmx: utils/clflags.cmx utils/config.cmx typing/ctype.cmx \
-    typing/env.cmx typing/ident.cmx typing/includemod.cmx \
-    parsing/location.cmx parsing/longident.cmx utils/misc.cmx \
-    typing/mtype.cmx parsing/parsetree.cmi typing/path.cmx \
-    typing/printtyp.cmx typing/stypes.cmx typing/subst.cmx \
-    typing/typeclass.cmx typing/typecore.cmx typing/typedecl.cmx \
-    typing/typedtree.cmx typing/types.cmx typing/typemod.cmi 
-typing/types.cmo: parsing/asttypes.cmi typing/ident.cmi utils/misc.cmi \
-    typing/path.cmi typing/primitive.cmi typing/types.cmi 
-typing/types.cmx: parsing/asttypes.cmi typing/ident.cmx utils/misc.cmx \
-    typing/path.cmx typing/primitive.cmx typing/types.cmi 
-typing/typetexp.cmo: typing/btype.cmi typing/ctype.cmi typing/env.cmi \
-    parsing/location.cmi parsing/longident.cmi utils/misc.cmi \
-    parsing/parsetree.cmi typing/path.cmi typing/printtyp.cmi utils/tbl.cmi \
-    typing/types.cmi utils/warnings.cmi typing/typetexp.cmi 
-typing/typetexp.cmx: typing/btype.cmx typing/ctype.cmx typing/env.cmx \
-    parsing/location.cmx parsing/longident.cmx utils/misc.cmx \
-    parsing/parsetree.cmi typing/path.cmx typing/printtyp.cmx utils/tbl.cmx \
-    typing/types.cmx utils/warnings.cmx typing/typetexp.cmi 
-bytecomp/bytegen.cmi: bytecomp/instruct.cmi bytecomp/lambda.cmi 
-bytecomp/bytelink.cmi: bytecomp/emitcode.cmi bytecomp/symtable.cmi 
+typing/stypes.cmo: typing/typedtree.cmi typing/printtyp.cmi \
+    parsing/location.cmi utils/clflags.cmo typing/stypes.cmi 
+typing/stypes.cmx: typing/typedtree.cmx typing/printtyp.cmx \
+    parsing/location.cmx utils/clflags.cmx typing/stypes.cmi 
+typing/subst.cmo: typing/types.cmi utils/tbl.cmi typing/path.cmi \
+    utils/misc.cmi typing/ident.cmi typing/btype.cmi typing/subst.cmi 
+typing/subst.cmx: typing/types.cmx utils/tbl.cmx typing/path.cmx \
+    utils/misc.cmx typing/ident.cmx typing/btype.cmx typing/subst.cmi 
+typing/typeclass.cmo: utils/warnings.cmi typing/typetexp.cmi typing/types.cmi \
+    typing/typedtree.cmi typing/typedecl.cmi typing/typecore.cmi \
+    typing/subst.cmi typing/stypes.cmi typing/printtyp.cmi typing/predef.cmi \
+    typing/path.cmi parsing/parsetree.cmi typing/parmatch.cmi utils/misc.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/includeclass.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi utils/clflags.cmo \
+    typing/btype.cmi parsing/asttypes.cmi typing/typeclass.cmi 
+typing/typeclass.cmx: utils/warnings.cmx typing/typetexp.cmx typing/types.cmx \
+    typing/typedtree.cmx typing/typedecl.cmx typing/typecore.cmx \
+    typing/subst.cmx typing/stypes.cmx typing/printtyp.cmx typing/predef.cmx \
+    typing/path.cmx parsing/parsetree.cmi typing/parmatch.cmx utils/misc.cmx \
+    parsing/longident.cmx parsing/location.cmx typing/includeclass.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx utils/clflags.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/typeclass.cmi 
+typing/typecore.cmo: utils/warnings.cmi typing/typetexp.cmi typing/types.cmi \
+    typing/typedtree.cmi typing/stypes.cmi typing/printtyp.cmi \
+    typing/primitive.cmi typing/predef.cmi typing/path.cmi \
+    parsing/parsetree.cmi typing/parmatch.cmi utils/misc.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/ident.cmi \
+    typing/env.cmi typing/ctype.cmi utils/clflags.cmo typing/btype.cmi \
+    parsing/asttypes.cmi typing/typecore.cmi 
+typing/typecore.cmx: utils/warnings.cmx typing/typetexp.cmx typing/types.cmx \
+    typing/typedtree.cmx typing/stypes.cmx typing/printtyp.cmx \
+    typing/primitive.cmx typing/predef.cmx typing/path.cmx \
+    parsing/parsetree.cmi typing/parmatch.cmx utils/misc.cmx \
+    parsing/longident.cmx parsing/location.cmx typing/ident.cmx \
+    typing/env.cmx typing/ctype.cmx utils/clflags.cmx typing/btype.cmx \
+    parsing/asttypes.cmi typing/typecore.cmi 
+typing/typedecl.cmo: typing/typetexp.cmi typing/types.cmi \
+    typing/typedtree.cmi typing/subst.cmi typing/printtyp.cmi \
+    typing/primitive.cmi typing/predef.cmi typing/path.cmi \
+    parsing/parsetree.cmi utils/misc.cmi parsing/longident.cmi \
+    parsing/location.cmi typing/includecore.cmi typing/ident.cmi \
+    typing/env.cmi typing/ctype.cmi utils/config.cmi utils/clflags.cmo \
+    typing/btype.cmi parsing/asttypes.cmi typing/typedecl.cmi 
+typing/typedecl.cmx: typing/typetexp.cmx typing/types.cmx \
+    typing/typedtree.cmx typing/subst.cmx typing/printtyp.cmx \
+    typing/primitive.cmx typing/predef.cmx typing/path.cmx \
+    parsing/parsetree.cmi utils/misc.cmx parsing/longident.cmx \
+    parsing/location.cmx typing/includecore.cmx typing/ident.cmx \
+    typing/env.cmx typing/ctype.cmx utils/config.cmx utils/clflags.cmx \
+    typing/btype.cmx parsing/asttypes.cmi typing/typedecl.cmi 
+typing/typedtree.cmo: typing/types.cmi typing/primitive.cmi typing/path.cmi \
+    utils/misc.cmi parsing/location.cmi typing/ident.cmi typing/env.cmi \
+    parsing/asttypes.cmi typing/typedtree.cmi 
+typing/typedtree.cmx: typing/types.cmx typing/primitive.cmx typing/path.cmx \
+    utils/misc.cmx parsing/location.cmx typing/ident.cmx typing/env.cmx \
+    parsing/asttypes.cmi typing/typedtree.cmi 
+typing/typemod.cmo: typing/types.cmi typing/typedtree.cmi typing/typedecl.cmi \
+    typing/typecore.cmi typing/typeclass.cmi typing/subst.cmi \
+    typing/stypes.cmi typing/printtyp.cmi typing/path.cmi \
+    parsing/parsetree.cmi typing/mtype.cmi utils/misc.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/includemod.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi utils/config.cmi \
+    utils/clflags.cmo typing/typemod.cmi 
+typing/typemod.cmx: typing/types.cmx typing/typedtree.cmx typing/typedecl.cmx \
+    typing/typecore.cmx typing/typeclass.cmx typing/subst.cmx \
+    typing/stypes.cmx typing/printtyp.cmx typing/path.cmx \
+    parsing/parsetree.cmi typing/mtype.cmx utils/misc.cmx \
+    parsing/longident.cmx parsing/location.cmx typing/includemod.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx utils/config.cmx \
+    utils/clflags.cmx typing/typemod.cmi 
+typing/types.cmo: typing/primitive.cmi typing/path.cmi utils/misc.cmi \
+    typing/ident.cmi parsing/asttypes.cmi typing/types.cmi 
+typing/types.cmx: typing/primitive.cmx typing/path.cmx utils/misc.cmx \
+    typing/ident.cmx parsing/asttypes.cmi typing/types.cmi 
+typing/typetexp.cmo: utils/warnings.cmi typing/types.cmi utils/tbl.cmi \
+    typing/printtyp.cmi typing/path.cmi parsing/parsetree.cmi utils/misc.cmi \
+    parsing/longident.cmi parsing/location.cmi typing/env.cmi \
+    typing/ctype.cmi typing/btype.cmi typing/typetexp.cmi 
+typing/typetexp.cmx: utils/warnings.cmx typing/types.cmx utils/tbl.cmx \
+    typing/printtyp.cmx typing/path.cmx parsing/parsetree.cmi utils/misc.cmx \
+    parsing/longident.cmx parsing/location.cmx typing/env.cmx \
+    typing/ctype.cmx typing/btype.cmx typing/typetexp.cmi 
+bytecomp/bytegen.cmi: bytecomp/lambda.cmi bytecomp/instruct.cmi 
+bytecomp/bytelink.cmi: bytecomp/symtable.cmi bytecomp/emitcode.cmi 
 bytecomp/bytepackager.cmi: typing/ident.cmi 
-bytecomp/emitcode.cmi: typing/ident.cmi bytecomp/instruct.cmi \
-    bytecomp/lambda.cmi 
-bytecomp/instruct.cmi: typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi \
-    typing/types.cmi 
-bytecomp/lambda.cmi: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    typing/path.cmi typing/primitive.cmi typing/types.cmi 
-bytecomp/matching.cmi: parsing/asttypes.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi parsing/location.cmi typing/typedtree.cmi 
+bytecomp/emitcode.cmi: bytecomp/lambda.cmi bytecomp/instruct.cmi \
+    typing/ident.cmi 
+bytecomp/instruct.cmi: typing/types.cmi bytecomp/lambda.cmi typing/ident.cmi \
+    typing/env.cmi 
+bytecomp/lambda.cmi: typing/types.cmi typing/primitive.cmi typing/path.cmi \
+    typing/ident.cmi typing/env.cmi parsing/asttypes.cmi 
+bytecomp/matching.cmi: typing/typedtree.cmi parsing/location.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi parsing/asttypes.cmi 
 bytecomp/printinstr.cmi: bytecomp/instruct.cmi 
 bytecomp/printlambda.cmi: bytecomp/lambda.cmi 
 bytecomp/simplif.cmi: bytecomp/lambda.cmi 
-bytecomp/symtable.cmi: bytecomp/emitcode.cmi typing/ident.cmi 
-bytecomp/translclass.cmi: typing/ident.cmi bytecomp/lambda.cmi \
-    parsing/location.cmi typing/typedtree.cmi 
-bytecomp/translcore.cmi: parsing/asttypes.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi parsing/location.cmi typing/path.cmi \
-    typing/primitive.cmi typing/typedtree.cmi typing/types.cmi 
-bytecomp/translmod.cmi: typing/ident.cmi bytecomp/lambda.cmi \
-    parsing/location.cmi typing/typedtree.cmi 
-bytecomp/translobj.cmi: typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi 
-bytecomp/typeopt.cmi: bytecomp/lambda.cmi typing/path.cmi \
-    typing/typedtree.cmi 
-bytecomp/bytegen.cmo: parsing/asttypes.cmi utils/config.cmi typing/ident.cmi \
-    bytecomp/instruct.cmi bytecomp/lambda.cmi utils/misc.cmi \
-    typing/primitive.cmi bytecomp/switch.cmi typing/types.cmi \
-    bytecomp/bytegen.cmi 
-bytecomp/bytegen.cmx: parsing/asttypes.cmi utils/config.cmx typing/ident.cmx \
-    bytecomp/instruct.cmx bytecomp/lambda.cmx utils/misc.cmx \
-    typing/primitive.cmx bytecomp/switch.cmx typing/types.cmx \
-    bytecomp/bytegen.cmi 
-bytecomp/bytelibrarian.cmo: bytecomp/bytelink.cmi utils/clflags.cmo \
-    utils/config.cmi bytecomp/emitcode.cmi utils/misc.cmi \
+bytecomp/symtable.cmi: typing/ident.cmi bytecomp/emitcode.cmi 
+bytecomp/translclass.cmi: typing/typedtree.cmi parsing/location.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi 
+bytecomp/translcore.cmi: typing/types.cmi typing/typedtree.cmi \
+    typing/primitive.cmi typing/path.cmi parsing/location.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi parsing/asttypes.cmi 
+bytecomp/translmod.cmi: typing/typedtree.cmi parsing/location.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi 
+bytecomp/translobj.cmi: bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi 
+bytecomp/typeopt.cmi: typing/typedtree.cmi typing/path.cmi \
+    bytecomp/lambda.cmi 
+bytecomp/bytegen.cmo: typing/types.cmi bytecomp/switch.cmi \
+    typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi \
+    bytecomp/instruct.cmi typing/ident.cmi utils/config.cmi \
+    parsing/asttypes.cmi bytecomp/bytegen.cmi 
+bytecomp/bytegen.cmx: typing/types.cmx bytecomp/switch.cmx \
+    typing/primitive.cmx utils/misc.cmx bytecomp/lambda.cmx \
+    bytecomp/instruct.cmx typing/ident.cmx utils/config.cmx \
+    parsing/asttypes.cmi bytecomp/bytegen.cmi 
+bytecomp/bytelibrarian.cmo: utils/misc.cmi bytecomp/emitcode.cmi \
+    utils/config.cmi utils/clflags.cmo bytecomp/bytelink.cmi \
     bytecomp/bytelibrarian.cmi 
-bytecomp/bytelibrarian.cmx: bytecomp/bytelink.cmx utils/clflags.cmx \
-    utils/config.cmx bytecomp/emitcode.cmx utils/misc.cmx \
+bytecomp/bytelibrarian.cmx: utils/misc.cmx bytecomp/emitcode.cmx \
+    utils/config.cmx utils/clflags.cmx bytecomp/bytelink.cmx \
     bytecomp/bytelibrarian.cmi 
-bytecomp/bytelink.cmo: bytecomp/bytesections.cmi utils/ccomp.cmi \
-    utils/clflags.cmo utils/config.cmi utils/consistbl.cmi bytecomp/dll.cmi \
-    bytecomp/emitcode.cmi typing/ident.cmi bytecomp/instruct.cmi \
-    utils/misc.cmi bytecomp/opcodes.cmo bytecomp/symtable.cmi \
-    bytecomp/bytelink.cmi 
-bytecomp/bytelink.cmx: bytecomp/bytesections.cmx utils/ccomp.cmx \
-    utils/clflags.cmx utils/config.cmx utils/consistbl.cmx bytecomp/dll.cmx \
-    bytecomp/emitcode.cmx typing/ident.cmx bytecomp/instruct.cmx \
-    utils/misc.cmx bytecomp/opcodes.cmx bytecomp/symtable.cmx \
-    bytecomp/bytelink.cmi 
-bytecomp/bytepackager.cmo: bytecomp/bytegen.cmi bytecomp/bytelink.cmi \
-    utils/clflags.cmo utils/config.cmi bytecomp/emitcode.cmi typing/env.cmi \
-    typing/ident.cmi bytecomp/instruct.cmi utils/misc.cmi \
-    bytecomp/translmod.cmi typing/typemod.cmi bytecomp/bytepackager.cmi 
-bytecomp/bytepackager.cmx: bytecomp/bytegen.cmx bytecomp/bytelink.cmx \
-    utils/clflags.cmx utils/config.cmx bytecomp/emitcode.cmx typing/env.cmx \
-    typing/ident.cmx bytecomp/instruct.cmx utils/misc.cmx \
-    bytecomp/translmod.cmx typing/typemod.cmx bytecomp/bytepackager.cmi 
+bytecomp/bytelink.cmo: bytecomp/symtable.cmi bytecomp/opcodes.cmo \
+    utils/misc.cmi bytecomp/instruct.cmi typing/ident.cmi \
+    bytecomp/emitcode.cmi bytecomp/dll.cmi utils/consistbl.cmi \
+    utils/config.cmi utils/clflags.cmo utils/ccomp.cmi \
+    bytecomp/bytesections.cmi bytecomp/bytelink.cmi 
+bytecomp/bytelink.cmx: bytecomp/symtable.cmx bytecomp/opcodes.cmx \
+    utils/misc.cmx bytecomp/instruct.cmx typing/ident.cmx \
+    bytecomp/emitcode.cmx bytecomp/dll.cmx utils/consistbl.cmx \
+    utils/config.cmx utils/clflags.cmx utils/ccomp.cmx \
+    bytecomp/bytesections.cmx bytecomp/bytelink.cmi 
+bytecomp/bytepackager.cmo: typing/typemod.cmi bytecomp/translmod.cmi \
+    utils/misc.cmi bytecomp/instruct.cmi typing/ident.cmi typing/env.cmi \
+    bytecomp/emitcode.cmi utils/config.cmi utils/clflags.cmo \
+    bytecomp/bytelink.cmi bytecomp/bytegen.cmi bytecomp/bytepackager.cmi 
+bytecomp/bytepackager.cmx: typing/typemod.cmx bytecomp/translmod.cmx \
+    utils/misc.cmx bytecomp/instruct.cmx typing/ident.cmx typing/env.cmx \
+    bytecomp/emitcode.cmx utils/config.cmx utils/clflags.cmx \
+    bytecomp/bytelink.cmx bytecomp/bytegen.cmx bytecomp/bytepackager.cmi 
 bytecomp/bytesections.cmo: utils/config.cmi bytecomp/bytesections.cmi 
 bytecomp/bytesections.cmx: utils/config.cmx bytecomp/bytesections.cmi 
-bytecomp/dll.cmo: utils/config.cmi utils/misc.cmi bytecomp/dll.cmi 
-bytecomp/dll.cmx: utils/config.cmx utils/misc.cmx bytecomp/dll.cmi 
-bytecomp/emitcode.cmo: parsing/asttypes.cmi typing/btype.cmi \
-    utils/clflags.cmo utils/config.cmi typing/env.cmi typing/ident.cmi \
-    bytecomp/instruct.cmi bytecomp/lambda.cmi bytecomp/meta.cmi \
-    utils/misc.cmi bytecomp/opcodes.cmo bytecomp/translmod.cmi \
+bytecomp/dll.cmo: utils/misc.cmi utils/config.cmi bytecomp/dll.cmi 
+bytecomp/dll.cmx: utils/misc.cmx utils/config.cmx bytecomp/dll.cmi 
+bytecomp/emitcode.cmo: bytecomp/translmod.cmi bytecomp/opcodes.cmo \
+    utils/misc.cmi bytecomp/meta.cmi bytecomp/lambda.cmi \
+    bytecomp/instruct.cmi typing/ident.cmi typing/env.cmi utils/config.cmi \
+    utils/clflags.cmo typing/btype.cmi parsing/asttypes.cmi \
     bytecomp/emitcode.cmi 
-bytecomp/emitcode.cmx: parsing/asttypes.cmi typing/btype.cmx \
-    utils/clflags.cmx utils/config.cmx typing/env.cmx typing/ident.cmx \
-    bytecomp/instruct.cmx bytecomp/lambda.cmx bytecomp/meta.cmx \
-    utils/misc.cmx bytecomp/opcodes.cmx bytecomp/translmod.cmx \
+bytecomp/emitcode.cmx: bytecomp/translmod.cmx bytecomp/opcodes.cmx \
+    utils/misc.cmx bytecomp/meta.cmx bytecomp/lambda.cmx \
+    bytecomp/instruct.cmx typing/ident.cmx typing/env.cmx utils/config.cmx \
+    utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi \
     bytecomp/emitcode.cmi 
-bytecomp/instruct.cmo: typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi \
-    typing/types.cmi bytecomp/instruct.cmi 
-bytecomp/instruct.cmx: typing/env.cmx typing/ident.cmx bytecomp/lambda.cmx \
-    typing/types.cmx bytecomp/instruct.cmi 
-bytecomp/lambda.cmo: parsing/asttypes.cmi typing/env.cmi typing/ident.cmi \
-    utils/misc.cmi typing/path.cmi typing/primitive.cmi typing/types.cmi \
+bytecomp/instruct.cmo: typing/types.cmi bytecomp/lambda.cmi typing/ident.cmi \
+    typing/env.cmi bytecomp/instruct.cmi 
+bytecomp/instruct.cmx: typing/types.cmx bytecomp/lambda.cmx typing/ident.cmx \
+    typing/env.cmx bytecomp/instruct.cmi 
+bytecomp/lambda.cmo: typing/types.cmi typing/primitive.cmi typing/path.cmi \
+    utils/misc.cmi typing/ident.cmi typing/env.cmi parsing/asttypes.cmi \
     bytecomp/lambda.cmi 
-bytecomp/lambda.cmx: parsing/asttypes.cmi typing/env.cmx typing/ident.cmx \
-    utils/misc.cmx typing/path.cmx typing/primitive.cmx typing/types.cmx \
+bytecomp/lambda.cmx: typing/types.cmx typing/primitive.cmx typing/path.cmx \
+    utils/misc.cmx typing/ident.cmx typing/env.cmx parsing/asttypes.cmi \
     bytecomp/lambda.cmi 
-bytecomp/matching.cmo: parsing/asttypes.cmi typing/btype.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi parsing/location.cmi utils/misc.cmi \
-    typing/parmatch.cmi typing/predef.cmi typing/primitive.cmi \
-    bytecomp/printlambda.cmi bytecomp/switch.cmi typing/typedtree.cmi \
-    bytecomp/typeopt.cmi typing/types.cmi bytecomp/matching.cmi 
-bytecomp/matching.cmx: parsing/asttypes.cmi typing/btype.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx parsing/location.cmx utils/misc.cmx \
-    typing/parmatch.cmx typing/predef.cmx typing/primitive.cmx \
-    bytecomp/printlambda.cmx bytecomp/switch.cmx typing/typedtree.cmx \
-    bytecomp/typeopt.cmx typing/types.cmx bytecomp/matching.cmi 
+bytecomp/matching.cmo: typing/types.cmi bytecomp/typeopt.cmi \
+    typing/typedtree.cmi bytecomp/switch.cmi bytecomp/printlambda.cmi \
+    typing/primitive.cmi typing/predef.cmi typing/parmatch.cmi utils/misc.cmi \
+    parsing/location.cmi bytecomp/lambda.cmi typing/ident.cmi \
+    typing/btype.cmi parsing/asttypes.cmi bytecomp/matching.cmi 
+bytecomp/matching.cmx: typing/types.cmx bytecomp/typeopt.cmx \
+    typing/typedtree.cmx bytecomp/switch.cmx bytecomp/printlambda.cmx \
+    typing/primitive.cmx typing/predef.cmx typing/parmatch.cmx utils/misc.cmx \
+    parsing/location.cmx bytecomp/lambda.cmx typing/ident.cmx \
+    typing/btype.cmx parsing/asttypes.cmi bytecomp/matching.cmi 
 bytecomp/meta.cmo: bytecomp/meta.cmi 
 bytecomp/meta.cmx: bytecomp/meta.cmi 
-bytecomp/printinstr.cmo: typing/ident.cmi bytecomp/instruct.cmi \
-    bytecomp/lambda.cmi bytecomp/printlambda.cmi bytecomp/printinstr.cmi 
-bytecomp/printinstr.cmx: typing/ident.cmx bytecomp/instruct.cmx \
-    bytecomp/lambda.cmx bytecomp/printlambda.cmx bytecomp/printinstr.cmi 
-bytecomp/printlambda.cmo: parsing/asttypes.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi typing/primitive.cmi typing/types.cmi \
+bytecomp/printinstr.cmo: bytecomp/printlambda.cmi bytecomp/lambda.cmi \
+    bytecomp/instruct.cmi typing/ident.cmi bytecomp/printinstr.cmi 
+bytecomp/printinstr.cmx: bytecomp/printlambda.cmx bytecomp/lambda.cmx \
+    bytecomp/instruct.cmx typing/ident.cmx bytecomp/printinstr.cmi 
+bytecomp/printlambda.cmo: typing/types.cmi typing/primitive.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi parsing/asttypes.cmi \
     bytecomp/printlambda.cmi 
-bytecomp/printlambda.cmx: parsing/asttypes.cmi typing/ident.cmx \
-    bytecomp/lambda.cmx typing/primitive.cmx typing/types.cmx \
+bytecomp/printlambda.cmx: typing/types.cmx typing/primitive.cmx \
+    bytecomp/lambda.cmx typing/ident.cmx parsing/asttypes.cmi \
     bytecomp/printlambda.cmi 
 bytecomp/runtimedef.cmo: bytecomp/runtimedef.cmi 
 bytecomp/runtimedef.cmx: bytecomp/runtimedef.cmi 
-bytecomp/simplif.cmo: parsing/asttypes.cmi utils/clflags.cmo typing/ident.cmi \
-    bytecomp/lambda.cmi bytecomp/simplif.cmi 
-bytecomp/simplif.cmx: parsing/asttypes.cmi utils/clflags.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx bytecomp/simplif.cmi 
+bytecomp/simplif.cmo: bytecomp/lambda.cmi typing/ident.cmi utils/clflags.cmo \
+    parsing/asttypes.cmi bytecomp/simplif.cmi 
+bytecomp/simplif.cmx: bytecomp/lambda.cmx typing/ident.cmx utils/clflags.cmx \
+    parsing/asttypes.cmi bytecomp/simplif.cmi 
 bytecomp/switch.cmo: bytecomp/switch.cmi 
 bytecomp/switch.cmx: bytecomp/switch.cmi 
-bytecomp/symtable.cmo: parsing/asttypes.cmi bytecomp/bytesections.cmi \
-    utils/clflags.cmo bytecomp/dll.cmi bytecomp/emitcode.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi bytecomp/meta.cmi utils/misc.cmi typing/predef.cmi \
-    bytecomp/runtimedef.cmi utils/tbl.cmi bytecomp/symtable.cmi 
-bytecomp/symtable.cmx: parsing/asttypes.cmi bytecomp/bytesections.cmx \
-    utils/clflags.cmx bytecomp/dll.cmx bytecomp/emitcode.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx bytecomp/meta.cmx utils/misc.cmx typing/predef.cmx \
-    bytecomp/runtimedef.cmx utils/tbl.cmx bytecomp/symtable.cmi 
-bytecomp/translclass.cmo: parsing/asttypes.cmi typing/btype.cmi \
-    utils/clflags.cmo typing/ctype.cmi typing/env.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi parsing/location.cmi bytecomp/matching.cmi \
-    utils/misc.cmi typing/path.cmi bytecomp/translcore.cmi \
-    bytecomp/translobj.cmi typing/typeclass.cmi typing/typedtree.cmi \
-    bytecomp/typeopt.cmi typing/types.cmi bytecomp/translclass.cmi 
-bytecomp/translclass.cmx: parsing/asttypes.cmi typing/btype.cmx \
-    utils/clflags.cmx typing/ctype.cmx typing/env.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx parsing/location.cmx bytecomp/matching.cmx \
-    utils/misc.cmx typing/path.cmx bytecomp/translcore.cmx \
-    bytecomp/translobj.cmx typing/typeclass.cmx typing/typedtree.cmx \
-    bytecomp/typeopt.cmx typing/types.cmx bytecomp/translclass.cmi 
-bytecomp/translcore.cmo: parsing/asttypes.cmi typing/btype.cmi \
-    utils/clflags.cmo utils/config.cmi typing/env.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi parsing/location.cmi bytecomp/matching.cmi \
-    utils/misc.cmi typing/path.cmi typing/predef.cmi typing/primitive.cmi \
-    bytecomp/translobj.cmi typing/typedtree.cmi bytecomp/typeopt.cmi \
-    typing/types.cmi bytecomp/translcore.cmi 
-bytecomp/translcore.cmx: parsing/asttypes.cmi typing/btype.cmx \
-    utils/clflags.cmx utils/config.cmx typing/env.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx parsing/location.cmx bytecomp/matching.cmx \
-    utils/misc.cmx typing/path.cmx typing/predef.cmx typing/primitive.cmx \
-    bytecomp/translobj.cmx typing/typedtree.cmx bytecomp/typeopt.cmx \
-    typing/types.cmx bytecomp/translcore.cmi 
-bytecomp/translmod.cmo: parsing/asttypes.cmi utils/config.cmi \
-    typing/ctype.cmi typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi \
-    parsing/location.cmi utils/misc.cmi typing/mtype.cmi typing/path.cmi \
-    typing/predef.cmi typing/primitive.cmi typing/printtyp.cmi \
-    bytecomp/translclass.cmi bytecomp/translcore.cmi bytecomp/translobj.cmi \
-    typing/typedtree.cmi typing/types.cmi bytecomp/translmod.cmi 
-bytecomp/translmod.cmx: parsing/asttypes.cmi utils/config.cmx \
-    typing/ctype.cmx typing/env.cmx typing/ident.cmx bytecomp/lambda.cmx \
-    parsing/location.cmx utils/misc.cmx typing/mtype.cmx typing/path.cmx \
-    typing/predef.cmx typing/primitive.cmx typing/printtyp.cmx \
-    bytecomp/translclass.cmx bytecomp/translcore.cmx bytecomp/translobj.cmx \
-    typing/typedtree.cmx typing/types.cmx bytecomp/translmod.cmi 
-bytecomp/translobj.cmo: parsing/asttypes.cmi typing/btype.cmi \
-    utils/clflags.cmo typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi \
-    parsing/longident.cmi utils/misc.cmi typing/primitive.cmi \
+bytecomp/symtable.cmo: utils/tbl.cmi bytecomp/runtimedef.cmi \
+    typing/predef.cmi utils/misc.cmi bytecomp/meta.cmi bytecomp/lambda.cmi \
+    typing/ident.cmi bytecomp/emitcode.cmi bytecomp/dll.cmi utils/clflags.cmo \
+    bytecomp/bytesections.cmi parsing/asttypes.cmi bytecomp/symtable.cmi 
+bytecomp/symtable.cmx: utils/tbl.cmx bytecomp/runtimedef.cmx \
+    typing/predef.cmx utils/misc.cmx bytecomp/meta.cmx bytecomp/lambda.cmx \
+    typing/ident.cmx bytecomp/emitcode.cmx bytecomp/dll.cmx utils/clflags.cmx \
+    bytecomp/bytesections.cmx parsing/asttypes.cmi bytecomp/symtable.cmi 
+bytecomp/translclass.cmo: typing/types.cmi bytecomp/typeopt.cmi \
+    typing/typedtree.cmi typing/typeclass.cmi bytecomp/translobj.cmi \
+    bytecomp/translcore.cmi typing/path.cmi utils/misc.cmi \
+    bytecomp/matching.cmi parsing/location.cmi bytecomp/lambda.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi utils/clflags.cmo \
+    typing/btype.cmi parsing/asttypes.cmi bytecomp/translclass.cmi 
+bytecomp/translclass.cmx: typing/types.cmx bytecomp/typeopt.cmx \
+    typing/typedtree.cmx typing/typeclass.cmx bytecomp/translobj.cmx \
+    bytecomp/translcore.cmx typing/path.cmx utils/misc.cmx \
+    bytecomp/matching.cmx parsing/location.cmx bytecomp/lambda.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx utils/clflags.cmx \
+    typing/btype.cmx parsing/asttypes.cmi bytecomp/translclass.cmi 
+bytecomp/translcore.cmo: typing/types.cmi bytecomp/typeopt.cmi \
+    typing/typedtree.cmi bytecomp/translobj.cmi typing/primitive.cmi \
+    typing/predef.cmi typing/path.cmi utils/misc.cmi bytecomp/matching.cmi \
+    parsing/location.cmi bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi \
+    utils/config.cmi utils/clflags.cmo typing/btype.cmi parsing/asttypes.cmi \
+    bytecomp/translcore.cmi 
+bytecomp/translcore.cmx: typing/types.cmx bytecomp/typeopt.cmx \
+    typing/typedtree.cmx bytecomp/translobj.cmx typing/primitive.cmx \
+    typing/predef.cmx typing/path.cmx utils/misc.cmx bytecomp/matching.cmx \
+    parsing/location.cmx bytecomp/lambda.cmx typing/ident.cmx typing/env.cmx \
+    utils/config.cmx utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi \
+    bytecomp/translcore.cmi 
+bytecomp/translmod.cmo: typing/types.cmi typing/typedtree.cmi \
+    bytecomp/translobj.cmi bytecomp/translcore.cmi bytecomp/translclass.cmi \
+    typing/printtyp.cmi typing/primitive.cmi typing/predef.cmi \
+    typing/path.cmi typing/mtype.cmi utils/misc.cmi parsing/location.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi typing/ctype.cmi \
+    utils/config.cmi parsing/asttypes.cmi bytecomp/translmod.cmi 
+bytecomp/translmod.cmx: typing/types.cmx typing/typedtree.cmx \
+    bytecomp/translobj.cmx bytecomp/translcore.cmx bytecomp/translclass.cmx \
+    typing/printtyp.cmx typing/primitive.cmx typing/predef.cmx \
+    typing/path.cmx typing/mtype.cmx utils/misc.cmx parsing/location.cmx \
+    bytecomp/lambda.cmx typing/ident.cmx typing/env.cmx typing/ctype.cmx \
+    utils/config.cmx parsing/asttypes.cmi bytecomp/translmod.cmi 
+bytecomp/translobj.cmo: typing/primitive.cmi utils/misc.cmi \
+    parsing/longident.cmi bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi \
+    utils/clflags.cmo typing/btype.cmi parsing/asttypes.cmi \
     bytecomp/translobj.cmi 
-bytecomp/translobj.cmx: parsing/asttypes.cmi typing/btype.cmx \
-    utils/clflags.cmx typing/env.cmx typing/ident.cmx bytecomp/lambda.cmx \
-    parsing/longident.cmx utils/misc.cmx typing/primitive.cmx \
+bytecomp/translobj.cmx: typing/primitive.cmx utils/misc.cmx \
+    parsing/longident.cmx bytecomp/lambda.cmx typing/ident.cmx typing/env.cmx \
+    utils/clflags.cmx typing/btype.cmx parsing/asttypes.cmi \
     bytecomp/translobj.cmi 
-bytecomp/typeopt.cmo: parsing/asttypes.cmi typing/ctype.cmi typing/env.cmi \
-    typing/ident.cmi bytecomp/lambda.cmi utils/misc.cmi typing/path.cmi \
-    typing/predef.cmi typing/primitive.cmi typing/typedtree.cmi \
-    typing/types.cmi bytecomp/typeopt.cmi 
-bytecomp/typeopt.cmx: parsing/asttypes.cmi typing/ctype.cmx typing/env.cmx \
-    typing/ident.cmx bytecomp/lambda.cmx utils/misc.cmx typing/path.cmx \
-    typing/predef.cmx typing/primitive.cmx typing/typedtree.cmx \
-    typing/types.cmx bytecomp/typeopt.cmi 
-asmcomp/asmgen.cmi: asmcomp/cmm.cmi bytecomp/lambda.cmi 
+bytecomp/typeopt.cmo: typing/types.cmi typing/typedtree.cmi \
+    typing/primitive.cmi typing/predef.cmi typing/path.cmi utils/misc.cmi \
+    bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi typing/ctype.cmi \
+    parsing/asttypes.cmi bytecomp/typeopt.cmi 
+bytecomp/typeopt.cmx: typing/types.cmx typing/typedtree.cmx \
+    typing/primitive.cmx typing/predef.cmx typing/path.cmx utils/misc.cmx \
+    bytecomp/lambda.cmx typing/ident.cmx typing/env.cmx typing/ctype.cmx \
+    parsing/asttypes.cmi bytecomp/typeopt.cmi 
+asmcomp/asmgen.cmi: bytecomp/lambda.cmi asmcomp/cmm.cmi 
 asmcomp/asmlink.cmi: asmcomp/compilenv.cmi 
-asmcomp/clambda.cmi: parsing/asttypes.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi 
-asmcomp/closure.cmi: asmcomp/clambda.cmi bytecomp/lambda.cmi 
+asmcomp/clambda.cmi: bytecomp/lambda.cmi typing/ident.cmi \
+    parsing/asttypes.cmi 
+asmcomp/closure.cmi: bytecomp/lambda.cmi asmcomp/clambda.cmi 
 asmcomp/cmm.cmi: typing/ident.cmi 
-asmcomp/cmmgen.cmi: asmcomp/clambda.cmi asmcomp/cmm.cmi 
+asmcomp/cmmgen.cmi: asmcomp/cmm.cmi asmcomp/clambda.cmi 
 asmcomp/codegen.cmi: asmcomp/cmm.cmi 
 asmcomp/comballoc.cmi: asmcomp/mach.cmi 
-asmcomp/compilenv.cmi: asmcomp/clambda.cmi typing/ident.cmi 
-asmcomp/emit.cmi: asmcomp/cmm.cmi asmcomp/linearize.cmi 
+asmcomp/compilenv.cmi: typing/ident.cmi asmcomp/clambda.cmi 
+asmcomp/emit.cmi: asmcomp/linearize.cmi asmcomp/cmm.cmi 
 asmcomp/interf.cmi: asmcomp/mach.cmi 
-asmcomp/linearize.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
+asmcomp/linearize.cmi: asmcomp/reg.cmi asmcomp/mach.cmi 
 asmcomp/liveness.cmi: asmcomp/mach.cmi 
-asmcomp/mach.cmi: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/reg.cmi 
+asmcomp/mach.cmi: asmcomp/reg.cmi asmcomp/cmm.cmi asmcomp/arch.cmo 
 asmcomp/printcmm.cmi: asmcomp/cmm.cmi 
 asmcomp/printlinear.cmi: asmcomp/linearize.cmi 
-asmcomp/printmach.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
-asmcomp/proc.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
+asmcomp/printmach.cmi: asmcomp/reg.cmi asmcomp/mach.cmi 
+asmcomp/proc.cmi: asmcomp/reg.cmi asmcomp/mach.cmi 
 asmcomp/reg.cmi: asmcomp/cmm.cmi 
 asmcomp/reload.cmi: asmcomp/mach.cmi 
-asmcomp/reloadgen.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
-asmcomp/schedgen.cmi: asmcomp/linearize.cmi asmcomp/mach.cmi 
+asmcomp/reloadgen.cmi: asmcomp/reg.cmi asmcomp/mach.cmi 
+asmcomp/schedgen.cmi: asmcomp/mach.cmi asmcomp/linearize.cmi 
 asmcomp/scheduling.cmi: asmcomp/linearize.cmi 
-asmcomp/selectgen.cmi: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
-    asmcomp/mach.cmi asmcomp/reg.cmi utils/tbl.cmi 
-asmcomp/selection.cmi: asmcomp/cmm.cmi asmcomp/mach.cmi 
+asmcomp/selectgen.cmi: utils/tbl.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
+    typing/ident.cmi asmcomp/cmm.cmi asmcomp/arch.cmo 
+asmcomp/selection.cmi: asmcomp/mach.cmi asmcomp/cmm.cmi 
 asmcomp/spill.cmi: asmcomp/mach.cmi 
 asmcomp/split.cmi: asmcomp/mach.cmi 
 asmcomp/arch.cmo: utils/misc.cmi 
 asmcomp/arch.cmx: utils/misc.cmx 
-asmcomp/asmgen.cmo: utils/clflags.cmo asmcomp/closure.cmi asmcomp/cmm.cmi \
-    asmcomp/cmmgen.cmi asmcomp/coloring.cmi asmcomp/comballoc.cmi \
-    utils/config.cmi asmcomp/emit.cmi asmcomp/emitaux.cmi asmcomp/interf.cmi \
-    asmcomp/linearize.cmi asmcomp/liveness.cmi asmcomp/mach.cmi \
-    utils/misc.cmi asmcomp/printcmm.cmi asmcomp/printlinear.cmi \
-    asmcomp/printmach.cmi asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/reload.cmi \
-    asmcomp/scheduling.cmi asmcomp/selection.cmi asmcomp/spill.cmi \
-    asmcomp/split.cmi asmcomp/asmgen.cmi 
-asmcomp/asmgen.cmx: utils/clflags.cmx asmcomp/closure.cmx asmcomp/cmm.cmx \
-    asmcomp/cmmgen.cmx asmcomp/coloring.cmx asmcomp/comballoc.cmx \
-    utils/config.cmx asmcomp/emit.cmx asmcomp/emitaux.cmx asmcomp/interf.cmx \
-    asmcomp/linearize.cmx asmcomp/liveness.cmx asmcomp/mach.cmx \
-    utils/misc.cmx asmcomp/printcmm.cmx asmcomp/printlinear.cmx \
-    asmcomp/printmach.cmx asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/reload.cmx \
-    asmcomp/scheduling.cmx asmcomp/selection.cmx asmcomp/spill.cmx \
-    asmcomp/split.cmx asmcomp/asmgen.cmi 
-asmcomp/asmlibrarian.cmo: asmcomp/asmlink.cmi utils/ccomp.cmi \
-    asmcomp/clambda.cmi utils/clflags.cmo asmcomp/compilenv.cmi \
-    utils/config.cmi utils/misc.cmi asmcomp/asmlibrarian.cmi 
-asmcomp/asmlibrarian.cmx: asmcomp/asmlink.cmx utils/ccomp.cmx \
-    asmcomp/clambda.cmx utils/clflags.cmx asmcomp/compilenv.cmx \
-    utils/config.cmx utils/misc.cmx asmcomp/asmlibrarian.cmi 
-asmcomp/asmlink.cmo: asmcomp/asmgen.cmi utils/ccomp.cmi utils/clflags.cmo \
-    asmcomp/cmmgen.cmi asmcomp/compilenv.cmi utils/config.cmi \
-    utils/consistbl.cmi asmcomp/emit.cmi asmcomp/emitaux.cmi \
-    parsing/location.cmi utils/misc.cmi asmcomp/proc.cmi \
-    bytecomp/runtimedef.cmi asmcomp/asmlink.cmi 
-asmcomp/asmlink.cmx: asmcomp/asmgen.cmx utils/ccomp.cmx utils/clflags.cmx \
-    asmcomp/cmmgen.cmx asmcomp/compilenv.cmx utils/config.cmx \
-    utils/consistbl.cmx asmcomp/emit.cmx asmcomp/emitaux.cmx \
-    parsing/location.cmx utils/misc.cmx asmcomp/proc.cmx \
-    bytecomp/runtimedef.cmx asmcomp/asmlink.cmi 
-asmcomp/asmpackager.cmo: asmcomp/asmgen.cmi asmcomp/asmlink.cmi \
-    utils/ccomp.cmi asmcomp/clambda.cmi asmcomp/compilenv.cmi \
-    utils/config.cmi typing/env.cmi typing/ident.cmi bytecomp/lambda.cmi \
-    parsing/location.cmi utils/misc.cmi utils/tbl.cmi bytecomp/translmod.cmi \
-    typing/typemod.cmi asmcomp/asmpackager.cmi 
-asmcomp/asmpackager.cmx: asmcomp/asmgen.cmx asmcomp/asmlink.cmx \
-    utils/ccomp.cmx asmcomp/clambda.cmx asmcomp/compilenv.cmx \
-    utils/config.cmx typing/env.cmx typing/ident.cmx bytecomp/lambda.cmx \
-    parsing/location.cmx utils/misc.cmx utils/tbl.cmx bytecomp/translmod.cmx \
-    typing/typemod.cmx asmcomp/asmpackager.cmi 
-asmcomp/clambda.cmo: parsing/asttypes.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi asmcomp/clambda.cmi 
-asmcomp/clambda.cmx: parsing/asttypes.cmi typing/ident.cmx \
-    bytecomp/lambda.cmx asmcomp/clambda.cmi 
-asmcomp/closure.cmo: parsing/asttypes.cmi asmcomp/clambda.cmi \
-    utils/clflags.cmo asmcomp/compilenv.cmi typing/ident.cmi \
-    bytecomp/lambda.cmi utils/misc.cmi typing/primitive.cmi \
-    bytecomp/switch.cmi utils/tbl.cmi asmcomp/closure.cmi 
-asmcomp/closure.cmx: parsing/asttypes.cmi asmcomp/clambda.cmx \
-    utils/clflags.cmx asmcomp/compilenv.cmx typing/ident.cmx \
-    bytecomp/lambda.cmx utils/misc.cmx typing/primitive.cmx \
-    bytecomp/switch.cmx utils/tbl.cmx asmcomp/closure.cmi 
-asmcomp/cmm.cmo: asmcomp/arch.cmo typing/ident.cmi asmcomp/cmm.cmi 
-asmcomp/cmm.cmx: asmcomp/arch.cmx typing/ident.cmx asmcomp/cmm.cmi 
-asmcomp/cmmgen.cmo: asmcomp/arch.cmo parsing/asttypes.cmi asmcomp/clambda.cmi \
-    utils/clflags.cmo asmcomp/cmm.cmi asmcomp/compilenv.cmi utils/config.cmi \
-    typing/ident.cmi bytecomp/lambda.cmi utils/misc.cmi typing/primitive.cmi \
-    asmcomp/proc.cmi bytecomp/switch.cmi typing/types.cmi asmcomp/cmmgen.cmi 
-asmcomp/cmmgen.cmx: asmcomp/arch.cmx parsing/asttypes.cmi asmcomp/clambda.cmx \
-    utils/clflags.cmx asmcomp/cmm.cmx asmcomp/compilenv.cmx utils/config.cmx \
-    typing/ident.cmx bytecomp/lambda.cmx utils/misc.cmx typing/primitive.cmx \
-    asmcomp/proc.cmx bytecomp/switch.cmx typing/types.cmx asmcomp/cmmgen.cmi 
-asmcomp/codegen.cmo: asmcomp/cmm.cmi asmcomp/coloring.cmi asmcomp/emit.cmi \
-    asmcomp/interf.cmi asmcomp/linearize.cmi asmcomp/liveness.cmi \
-    asmcomp/printcmm.cmi asmcomp/printlinear.cmi asmcomp/printmach.cmi \
-    asmcomp/reg.cmi asmcomp/reload.cmi asmcomp/spill.cmi asmcomp/split.cmi \
+asmcomp/asmgen.cmo: asmcomp/split.cmi asmcomp/spill.cmi asmcomp/selection.cmi \
+    asmcomp/scheduling.cmi asmcomp/reload.cmi asmcomp/reg.cmi \
+    asmcomp/proc.cmi asmcomp/printmach.cmi asmcomp/printlinear.cmi \
+    asmcomp/printcmm.cmi utils/misc.cmi asmcomp/mach.cmi asmcomp/liveness.cmi \
+    asmcomp/linearize.cmi asmcomp/interf.cmi asmcomp/emitaux.cmi \
+    asmcomp/emit.cmi utils/config.cmi asmcomp/comballoc.cmi \
+    asmcomp/coloring.cmi asmcomp/cmmgen.cmi asmcomp/cmm.cmi \
+    asmcomp/closure.cmi utils/clflags.cmo asmcomp/asmgen.cmi 
+asmcomp/asmgen.cmx: asmcomp/split.cmx asmcomp/spill.cmx asmcomp/selection.cmx \
+    asmcomp/scheduling.cmx asmcomp/reload.cmx asmcomp/reg.cmx \
+    asmcomp/proc.cmx asmcomp/printmach.cmx asmcomp/printlinear.cmx \
+    asmcomp/printcmm.cmx utils/misc.cmx asmcomp/mach.cmx asmcomp/liveness.cmx \
+    asmcomp/linearize.cmx asmcomp/interf.cmx asmcomp/emitaux.cmx \
+    asmcomp/emit.cmx utils/config.cmx asmcomp/comballoc.cmx \
+    asmcomp/coloring.cmx asmcomp/cmmgen.cmx asmcomp/cmm.cmx \
+    asmcomp/closure.cmx utils/clflags.cmx asmcomp/asmgen.cmi 
+asmcomp/asmlibrarian.cmo: utils/misc.cmi utils/config.cmi \
+    asmcomp/compilenv.cmi utils/clflags.cmo asmcomp/clambda.cmi \
+    utils/ccomp.cmi asmcomp/asmlink.cmi asmcomp/asmlibrarian.cmi 
+asmcomp/asmlibrarian.cmx: utils/misc.cmx utils/config.cmx \
+    asmcomp/compilenv.cmx utils/clflags.cmx asmcomp/clambda.cmx \
+    utils/ccomp.cmx asmcomp/asmlink.cmx asmcomp/asmlibrarian.cmi 
+asmcomp/asmlink.cmo: bytecomp/runtimedef.cmi asmcomp/proc.cmi utils/misc.cmi \
+    parsing/location.cmi asmcomp/emitaux.cmi asmcomp/emit.cmi \
+    utils/consistbl.cmi utils/config.cmi asmcomp/compilenv.cmi \
+    asmcomp/cmmgen.cmi utils/clflags.cmo utils/ccomp.cmi asmcomp/asmgen.cmi \
+    asmcomp/asmlink.cmi 
+asmcomp/asmlink.cmx: bytecomp/runtimedef.cmx asmcomp/proc.cmx utils/misc.cmx \
+    parsing/location.cmx asmcomp/emitaux.cmx asmcomp/emit.cmx \
+    utils/consistbl.cmx utils/config.cmx asmcomp/compilenv.cmx \
+    asmcomp/cmmgen.cmx utils/clflags.cmx utils/ccomp.cmx asmcomp/asmgen.cmx \
+    asmcomp/asmlink.cmi 
+asmcomp/asmpackager.cmo: typing/typemod.cmi bytecomp/translmod.cmi \
+    utils/tbl.cmi utils/misc.cmi parsing/location.cmi bytecomp/lambda.cmi \
+    typing/ident.cmi typing/env.cmi utils/config.cmi asmcomp/compilenv.cmi \
+    asmcomp/clambda.cmi utils/ccomp.cmi asmcomp/asmlink.cmi \
+    asmcomp/asmgen.cmi asmcomp/asmpackager.cmi 
+asmcomp/asmpackager.cmx: typing/typemod.cmx bytecomp/translmod.cmx \
+    utils/tbl.cmx utils/misc.cmx parsing/location.cmx bytecomp/lambda.cmx \
+    typing/ident.cmx typing/env.cmx utils/config.cmx asmcomp/compilenv.cmx \
+    asmcomp/clambda.cmx utils/ccomp.cmx asmcomp/asmlink.cmx \
+    asmcomp/asmgen.cmx asmcomp/asmpackager.cmi 
+asmcomp/clambda.cmo: bytecomp/lambda.cmi typing/ident.cmi \
+    parsing/asttypes.cmi asmcomp/clambda.cmi 
+asmcomp/clambda.cmx: bytecomp/lambda.cmx typing/ident.cmx \
+    parsing/asttypes.cmi asmcomp/clambda.cmi 
+asmcomp/closure.cmo: utils/tbl.cmi bytecomp/switch.cmi typing/primitive.cmi \
+    utils/misc.cmi bytecomp/lambda.cmi typing/ident.cmi asmcomp/compilenv.cmi \
+    utils/clflags.cmo asmcomp/clambda.cmi parsing/asttypes.cmi \
+    asmcomp/closure.cmi 
+asmcomp/closure.cmx: utils/tbl.cmx bytecomp/switch.cmx typing/primitive.cmx \
+    utils/misc.cmx bytecomp/lambda.cmx typing/ident.cmx asmcomp/compilenv.cmx \
+    utils/clflags.cmx asmcomp/clambda.cmx parsing/asttypes.cmi \
+    asmcomp/closure.cmi 
+asmcomp/cmm.cmo: typing/ident.cmi asmcomp/arch.cmo asmcomp/cmm.cmi 
+asmcomp/cmm.cmx: typing/ident.cmx asmcomp/arch.cmx asmcomp/cmm.cmi 
+asmcomp/cmmgen.cmo: typing/types.cmi bytecomp/switch.cmi asmcomp/proc.cmi \
+    typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi typing/ident.cmi \
+    utils/config.cmi asmcomp/compilenv.cmi asmcomp/cmm.cmi utils/clflags.cmo \
+    asmcomp/clambda.cmi parsing/asttypes.cmi asmcomp/arch.cmo \
+    asmcomp/cmmgen.cmi 
+asmcomp/cmmgen.cmx: typing/types.cmx bytecomp/switch.cmx asmcomp/proc.cmx \
+    typing/primitive.cmx utils/misc.cmx bytecomp/lambda.cmx typing/ident.cmx \
+    utils/config.cmx asmcomp/compilenv.cmx asmcomp/cmm.cmx utils/clflags.cmx \
+    asmcomp/clambda.cmx parsing/asttypes.cmi asmcomp/arch.cmx \
+    asmcomp/cmmgen.cmi 
+asmcomp/codegen.cmo: asmcomp/split.cmi asmcomp/spill.cmi asmcomp/reload.cmi \
+    asmcomp/reg.cmi asmcomp/printmach.cmi asmcomp/printlinear.cmi \
+    asmcomp/printcmm.cmi asmcomp/liveness.cmi asmcomp/linearize.cmi \
+    asmcomp/interf.cmi asmcomp/emit.cmi asmcomp/coloring.cmi asmcomp/cmm.cmi \
     asmcomp/codegen.cmi 
-asmcomp/codegen.cmx: asmcomp/cmm.cmx asmcomp/coloring.cmx asmcomp/emit.cmx \
-    asmcomp/interf.cmx asmcomp/linearize.cmx asmcomp/liveness.cmx \
-    asmcomp/printcmm.cmx asmcomp/printlinear.cmx asmcomp/printmach.cmx \
-    asmcomp/reg.cmx asmcomp/reload.cmx asmcomp/spill.cmx asmcomp/split.cmx \
+asmcomp/codegen.cmx: asmcomp/split.cmx asmcomp/spill.cmx asmcomp/reload.cmx \
+    asmcomp/reg.cmx asmcomp/printmach.cmx asmcomp/printlinear.cmx \
+    asmcomp/printcmm.cmx asmcomp/liveness.cmx asmcomp/linearize.cmx \
+    asmcomp/interf.cmx asmcomp/emit.cmx asmcomp/coloring.cmx asmcomp/cmm.cmx \
     asmcomp/codegen.cmi 
-asmcomp/coloring.cmo: asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/coloring.cmi 
-asmcomp/coloring.cmx: asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/coloring.cmi 
-asmcomp/comballoc.cmo: utils/config.cmi asmcomp/mach.cmi asmcomp/reg.cmi \
+asmcomp/coloring.cmo: asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/coloring.cmi 
+asmcomp/coloring.cmx: asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/coloring.cmi 
+asmcomp/comballoc.cmo: asmcomp/reg.cmi asmcomp/mach.cmi utils/config.cmi \
     asmcomp/comballoc.cmi 
-asmcomp/comballoc.cmx: utils/config.cmx asmcomp/mach.cmx asmcomp/reg.cmx \
+asmcomp/comballoc.cmx: asmcomp/reg.cmx asmcomp/mach.cmx utils/config.cmx \
     asmcomp/comballoc.cmi 
-asmcomp/compilenv.cmo: asmcomp/clambda.cmi utils/config.cmi typing/env.cmi \
-    typing/ident.cmi utils/misc.cmi asmcomp/compilenv.cmi 
-asmcomp/compilenv.cmx: asmcomp/clambda.cmx utils/config.cmx typing/env.cmx \
-    typing/ident.cmx utils/misc.cmx asmcomp/compilenv.cmi 
-asmcomp/emit.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/compilenv.cmi \
-    utils/config.cmi asmcomp/emitaux.cmi asmcomp/linearize.cmi \
-    parsing/location.cmi asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
-    asmcomp/reg.cmi asmcomp/emit.cmi 
-asmcomp/emit.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/compilenv.cmx \
-    utils/config.cmx asmcomp/emitaux.cmx asmcomp/linearize.cmx \
-    parsing/location.cmx asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
-    asmcomp/reg.cmx asmcomp/emit.cmi 
+asmcomp/compilenv.cmo: utils/misc.cmi typing/ident.cmi typing/env.cmi \
+    utils/config.cmi asmcomp/clambda.cmi asmcomp/compilenv.cmi 
+asmcomp/compilenv.cmx: utils/misc.cmx typing/ident.cmx typing/env.cmx \
+    utils/config.cmx asmcomp/clambda.cmx asmcomp/compilenv.cmi 
+asmcomp/emit.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
+    asmcomp/mach.cmi parsing/location.cmi asmcomp/linearize.cmi \
+    asmcomp/emitaux.cmi utils/config.cmi asmcomp/compilenv.cmi \
+    asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/emit.cmi 
+asmcomp/emit.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
+    asmcomp/mach.cmx parsing/location.cmx asmcomp/linearize.cmx \
+    asmcomp/emitaux.cmx utils/config.cmx asmcomp/compilenv.cmx \
+    asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/emit.cmi 
 asmcomp/emitaux.cmo: asmcomp/emitaux.cmi 
 asmcomp/emitaux.cmx: asmcomp/emitaux.cmi 
-asmcomp/interf.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
-    asmcomp/reg.cmi asmcomp/interf.cmi 
-asmcomp/interf.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
-    asmcomp/reg.cmx asmcomp/interf.cmi 
-asmcomp/linearize.cmo: asmcomp/cmm.cmi asmcomp/mach.cmi utils/misc.cmi \
-    asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/linearize.cmi 
-asmcomp/linearize.cmx: asmcomp/cmm.cmx asmcomp/mach.cmx utils/misc.cmx \
-    asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/linearize.cmi 
-asmcomp/liveness.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/printmach.cmi \
-    asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/liveness.cmi 
-asmcomp/liveness.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/printmach.cmx \
-    asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/liveness.cmi 
-asmcomp/mach.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/reg.cmi \
+asmcomp/interf.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
+    asmcomp/mach.cmi asmcomp/interf.cmi 
+asmcomp/interf.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
+    asmcomp/mach.cmx asmcomp/interf.cmi 
+asmcomp/linearize.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
+    asmcomp/mach.cmi asmcomp/cmm.cmi asmcomp/linearize.cmi 
+asmcomp/linearize.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
+    asmcomp/mach.cmx asmcomp/cmm.cmx asmcomp/linearize.cmi 
+asmcomp/liveness.cmo: asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/printmach.cmi \
+    utils/misc.cmi asmcomp/mach.cmi asmcomp/liveness.cmi 
+asmcomp/liveness.cmx: asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/printmach.cmx \
+    utils/misc.cmx asmcomp/mach.cmx asmcomp/liveness.cmi 
+asmcomp/mach.cmo: asmcomp/reg.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
     asmcomp/mach.cmi 
-asmcomp/mach.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/reg.cmx \
+asmcomp/mach.cmx: asmcomp/reg.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
     asmcomp/mach.cmi 
-asmcomp/printcmm.cmo: asmcomp/cmm.cmi typing/ident.cmi asmcomp/printcmm.cmi 
-asmcomp/printcmm.cmx: asmcomp/cmm.cmx typing/ident.cmx asmcomp/printcmm.cmi 
-asmcomp/printlinear.cmo: asmcomp/linearize.cmi asmcomp/mach.cmi \
-    asmcomp/printmach.cmi asmcomp/printlinear.cmi 
-asmcomp/printlinear.cmx: asmcomp/linearize.cmx asmcomp/mach.cmx \
-    asmcomp/printmach.cmx asmcomp/printlinear.cmi 
-asmcomp/printmach.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    asmcomp/printcmm.cmi asmcomp/proc.cmi asmcomp/reg.cmi \
-    asmcomp/printmach.cmi 
-asmcomp/printmach.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    asmcomp/printcmm.cmx asmcomp/proc.cmx asmcomp/reg.cmx \
-    asmcomp/printmach.cmi 
-asmcomp/proc.cmo: asmcomp/arch.cmo utils/ccomp.cmi utils/clflags.cmo \
-    asmcomp/cmm.cmi utils/config.cmi asmcomp/mach.cmi utils/misc.cmi \
-    asmcomp/reg.cmi asmcomp/proc.cmi 
-asmcomp/proc.cmx: asmcomp/arch.cmx utils/ccomp.cmx utils/clflags.cmx \
-    asmcomp/cmm.cmx utils/config.cmx asmcomp/mach.cmx utils/misc.cmx \
-    asmcomp/reg.cmx asmcomp/proc.cmi 
+asmcomp/printcmm.cmo: typing/ident.cmi asmcomp/cmm.cmi asmcomp/printcmm.cmi 
+asmcomp/printcmm.cmx: typing/ident.cmx asmcomp/cmm.cmx asmcomp/printcmm.cmi 
+asmcomp/printlinear.cmo: asmcomp/printmach.cmi asmcomp/mach.cmi \
+    asmcomp/linearize.cmi asmcomp/printlinear.cmi 
+asmcomp/printlinear.cmx: asmcomp/printmach.cmx asmcomp/mach.cmx \
+    asmcomp/linearize.cmx asmcomp/printlinear.cmi 
+asmcomp/printmach.cmo: asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/printcmm.cmi \
+    asmcomp/mach.cmi asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/printmach.cmi 
+asmcomp/printmach.cmx: asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/printcmm.cmx \
+    asmcomp/mach.cmx asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/printmach.cmi 
+asmcomp/proc.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
+    utils/config.cmi asmcomp/cmm.cmi utils/clflags.cmo utils/ccomp.cmi \
+    asmcomp/arch.cmo asmcomp/proc.cmi 
+asmcomp/proc.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
+    utils/config.cmx asmcomp/cmm.cmx utils/clflags.cmx utils/ccomp.cmx \
+    asmcomp/arch.cmx asmcomp/proc.cmi 
 asmcomp/reg.cmo: asmcomp/cmm.cmi asmcomp/reg.cmi 
 asmcomp/reg.cmx: asmcomp/cmm.cmx asmcomp/reg.cmi 
 asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reload.cmi 
 asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reload.cmi 
-asmcomp/reloadgen.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi \
+asmcomp/reloadgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
     asmcomp/reloadgen.cmi 
-asmcomp/reloadgen.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx \
+asmcomp/reloadgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
     asmcomp/reloadgen.cmi 
-asmcomp/schedgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/linearize.cmi \
-    asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi asmcomp/schedgen.cmi 
-asmcomp/schedgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/linearize.cmx \
-    asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx asmcomp/schedgen.cmi 
-asmcomp/scheduling.cmo: asmcomp/arch.cmo asmcomp/mach.cmi \
-    asmcomp/schedgen.cmi asmcomp/scheduling.cmi 
-asmcomp/scheduling.cmx: asmcomp/arch.cmx asmcomp/mach.cmx \
-    asmcomp/schedgen.cmx asmcomp/scheduling.cmi 
-asmcomp/selectgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
-    asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi \
-    utils/tbl.cmi asmcomp/selectgen.cmi 
-asmcomp/selectgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx typing/ident.cmx \
-    asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx \
-    utils/tbl.cmx asmcomp/selectgen.cmi 
-asmcomp/selection.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    utils/misc.cmi asmcomp/reg.cmi asmcomp/selectgen.cmi \
-    asmcomp/selection.cmi 
-asmcomp/selection.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    utils/misc.cmx asmcomp/reg.cmx asmcomp/selectgen.cmx \
-    asmcomp/selection.cmi 
-asmcomp/spill.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
-    asmcomp/reg.cmi asmcomp/spill.cmi 
-asmcomp/spill.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
-    asmcomp/reg.cmx asmcomp/spill.cmi 
-asmcomp/split.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi \
+asmcomp/schedgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
+    asmcomp/linearize.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
+    asmcomp/schedgen.cmi 
+asmcomp/schedgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
+    asmcomp/linearize.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
+    asmcomp/schedgen.cmi 
+asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/mach.cmi \
+    asmcomp/arch.cmo asmcomp/scheduling.cmi 
+asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/mach.cmx \
+    asmcomp/arch.cmx asmcomp/scheduling.cmi 
+asmcomp/selectgen.cmo: utils/tbl.cmi asmcomp/reg.cmi asmcomp/proc.cmi \
+    utils/misc.cmi asmcomp/mach.cmi typing/ident.cmi asmcomp/cmm.cmi \
+    asmcomp/arch.cmo asmcomp/selectgen.cmi 
+asmcomp/selectgen.cmx: utils/tbl.cmx asmcomp/reg.cmx asmcomp/proc.cmx \
+    utils/misc.cmx asmcomp/mach.cmx typing/ident.cmx asmcomp/cmm.cmx \
+    asmcomp/arch.cmx asmcomp/selectgen.cmi 
+asmcomp/selection.cmo: asmcomp/selectgen.cmi asmcomp/reg.cmi utils/misc.cmi \
+    asmcomp/mach.cmi asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/selection.cmi 
+asmcomp/selection.cmx: asmcomp/selectgen.cmx asmcomp/reg.cmx utils/misc.cmx \
+    asmcomp/mach.cmx asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/selection.cmi 
+asmcomp/spill.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
+    asmcomp/mach.cmi asmcomp/spill.cmi 
+asmcomp/spill.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
+    asmcomp/mach.cmx asmcomp/spill.cmi 
+asmcomp/split.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
     asmcomp/split.cmi 
-asmcomp/split.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx \
+asmcomp/split.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
     asmcomp/split.cmi 
 driver/compile.cmi: typing/env.cmi 
 driver/optcompile.cmi: typing/env.cmi 
-driver/compile.cmo: bytecomp/bytegen.cmi utils/ccomp.cmi utils/clflags.cmo \
-    utils/config.cmi bytecomp/emitcode.cmi typing/env.cmi typing/ident.cmi \
-    utils/misc.cmi parsing/parse.cmi driver/pparse.cmi parsing/printast.cmi \
-    bytecomp/printinstr.cmi bytecomp/printlambda.cmi typing/printtyp.cmi \
-    bytecomp/simplif.cmi bytecomp/translmod.cmi typing/typedtree.cmi \
-    typing/typemod.cmi utils/warnings.cmi driver/compile.cmi 
-driver/compile.cmx: bytecomp/bytegen.cmx utils/ccomp.cmx utils/clflags.cmx \
-    utils/config.cmx bytecomp/emitcode.cmx typing/env.cmx typing/ident.cmx \
-    utils/misc.cmx parsing/parse.cmx driver/pparse.cmx parsing/printast.cmx \
-    bytecomp/printinstr.cmx bytecomp/printlambda.cmx typing/printtyp.cmx \
-    bytecomp/simplif.cmx bytecomp/translmod.cmx typing/typedtree.cmx \
-    typing/typemod.cmx utils/warnings.cmx driver/compile.cmi 
-driver/errors.cmo: bytecomp/bytelibrarian.cmi bytecomp/bytelink.cmi \
-    bytecomp/bytepackager.cmi typing/ctype.cmi typing/env.cmi \
-    typing/includemod.cmi parsing/lexer.cmi parsing/location.cmi \
-    driver/pparse.cmi bytecomp/symtable.cmi parsing/syntaxerr.cmi \
-    bytecomp/translclass.cmi bytecomp/translcore.cmi bytecomp/translmod.cmi \
-    typing/typeclass.cmi typing/typecore.cmi typing/typedecl.cmi \
-    typing/typemod.cmi typing/typetexp.cmi utils/warnings.cmi \
-    driver/errors.cmi 
-driver/errors.cmx: bytecomp/bytelibrarian.cmx bytecomp/bytelink.cmx \
-    bytecomp/bytepackager.cmx typing/ctype.cmx typing/env.cmx \
-    typing/includemod.cmx parsing/lexer.cmx parsing/location.cmx \
-    driver/pparse.cmx bytecomp/symtable.cmx parsing/syntaxerr.cmx \
-    bytecomp/translclass.cmx bytecomp/translcore.cmx bytecomp/translmod.cmx \
-    typing/typeclass.cmx typing/typecore.cmx typing/typedecl.cmx \
-    typing/typemod.cmx typing/typetexp.cmx utils/warnings.cmx \
-    driver/errors.cmi 
-driver/main.cmo: bytecomp/bytelibrarian.cmi bytecomp/bytelink.cmi \
-    bytecomp/bytepackager.cmi utils/clflags.cmo driver/compile.cmi \
-    utils/config.cmi driver/errors.cmi driver/main_args.cmi utils/misc.cmi \
-    utils/warnings.cmi driver/main.cmi 
-driver/main.cmx: bytecomp/bytelibrarian.cmx bytecomp/bytelink.cmx \
-    bytecomp/bytepackager.cmx utils/clflags.cmx driver/compile.cmx \
-    utils/config.cmx driver/errors.cmx driver/main_args.cmx utils/misc.cmx \
-    utils/warnings.cmx driver/main.cmi 
+driver/compile.cmo: utils/warnings.cmi typing/typemod.cmi \
+    typing/typedtree.cmi bytecomp/translmod.cmi bytecomp/simplif.cmi \
+    typing/printtyp.cmi bytecomp/printlambda.cmi bytecomp/printinstr.cmi \
+    parsing/printast.cmi driver/pparse.cmi parsing/parse.cmi utils/misc.cmi \
+    typing/ident.cmi typing/env.cmi bytecomp/emitcode.cmi utils/config.cmi \
+    utils/clflags.cmo utils/ccomp.cmi bytecomp/bytegen.cmi driver/compile.cmi 
+driver/compile.cmx: utils/warnings.cmx typing/typemod.cmx \
+    typing/typedtree.cmx bytecomp/translmod.cmx bytecomp/simplif.cmx \
+    typing/printtyp.cmx bytecomp/printlambda.cmx bytecomp/printinstr.cmx \
+    parsing/printast.cmx driver/pparse.cmx parsing/parse.cmx utils/misc.cmx \
+    typing/ident.cmx typing/env.cmx bytecomp/emitcode.cmx utils/config.cmx \
+    utils/clflags.cmx utils/ccomp.cmx bytecomp/bytegen.cmx driver/compile.cmi 
+driver/errors.cmo: utils/warnings.cmi typing/typetexp.cmi typing/typemod.cmi \
+    typing/typedecl.cmi typing/typecore.cmi typing/typeclass.cmi \
+    bytecomp/translmod.cmi bytecomp/translcore.cmi bytecomp/translclass.cmi \
+    parsing/syntaxerr.cmi bytecomp/symtable.cmi driver/pparse.cmi \
+    parsing/location.cmi parsing/lexer.cmi typing/includemod.cmi \
+    typing/env.cmi typing/ctype.cmi bytecomp/bytepackager.cmi \
+    bytecomp/bytelink.cmi bytecomp/bytelibrarian.cmi driver/errors.cmi 
+driver/errors.cmx: utils/warnings.cmx typing/typetexp.cmx typing/typemod.cmx \
+    typing/typedecl.cmx typing/typecore.cmx typing/typeclass.cmx \
+    bytecomp/translmod.cmx bytecomp/translcore.cmx bytecomp/translclass.cmx \
+    parsing/syntaxerr.cmx bytecomp/symtable.cmx driver/pparse.cmx \
+    parsing/location.cmx parsing/lexer.cmx typing/includemod.cmx \
+    typing/env.cmx typing/ctype.cmx bytecomp/bytepackager.cmx \
+    bytecomp/bytelink.cmx bytecomp/bytelibrarian.cmx driver/errors.cmi 
+driver/main.cmo: utils/warnings.cmi utils/misc.cmi driver/main_args.cmi \
+    driver/errors.cmi utils/config.cmi driver/compile.cmi utils/clflags.cmo \
+    bytecomp/bytepackager.cmi bytecomp/bytelink.cmi \
+    bytecomp/bytelibrarian.cmi driver/main.cmi 
+driver/main.cmx: utils/warnings.cmx utils/misc.cmx driver/main_args.cmx \
+    driver/errors.cmx utils/config.cmx driver/compile.cmx utils/clflags.cmx \
+    bytecomp/bytepackager.cmx bytecomp/bytelink.cmx \
+    bytecomp/bytelibrarian.cmx driver/main.cmi 
 driver/main_args.cmo: driver/main_args.cmi 
 driver/main_args.cmx: driver/main_args.cmi 
-driver/optcompile.cmo: asmcomp/asmgen.cmi utils/ccomp.cmi utils/clflags.cmo \
-    asmcomp/compilenv.cmi utils/config.cmi typing/env.cmi typing/ident.cmi \
-    utils/misc.cmi parsing/parse.cmi driver/pparse.cmi parsing/printast.cmi \
-    bytecomp/printlambda.cmi typing/printtyp.cmi bytecomp/simplif.cmi \
-    bytecomp/translmod.cmi typing/typedtree.cmi typing/typemod.cmi \
-    utils/warnings.cmi driver/optcompile.cmi 
-driver/optcompile.cmx: asmcomp/asmgen.cmx utils/ccomp.cmx utils/clflags.cmx \
-    asmcomp/compilenv.cmx utils/config.cmx typing/env.cmx typing/ident.cmx \
-    utils/misc.cmx parsing/parse.cmx driver/pparse.cmx parsing/printast.cmx \
-    bytecomp/printlambda.cmx typing/printtyp.cmx bytecomp/simplif.cmx \
-    bytecomp/translmod.cmx typing/typedtree.cmx typing/typemod.cmx \
-    utils/warnings.cmx driver/optcompile.cmi 
-driver/opterrors.cmo: asmcomp/asmgen.cmi asmcomp/asmlibrarian.cmi \
-    asmcomp/asmlink.cmi asmcomp/asmpackager.cmi asmcomp/compilenv.cmi \
-    typing/ctype.cmi typing/env.cmi typing/includemod.cmi parsing/lexer.cmi \
-    parsing/location.cmi driver/pparse.cmi parsing/syntaxerr.cmi \
-    bytecomp/translclass.cmi bytecomp/translcore.cmi bytecomp/translmod.cmi \
-    typing/typeclass.cmi typing/typecore.cmi typing/typedecl.cmi \
-    typing/typemod.cmi typing/typetexp.cmi utils/warnings.cmi \
-    driver/opterrors.cmi 
-driver/opterrors.cmx: asmcomp/asmgen.cmx asmcomp/asmlibrarian.cmx \
-    asmcomp/asmlink.cmx asmcomp/asmpackager.cmx asmcomp/compilenv.cmx \
-    typing/ctype.cmx typing/env.cmx typing/includemod.cmx parsing/lexer.cmx \
-    parsing/location.cmx driver/pparse.cmx parsing/syntaxerr.cmx \
-    bytecomp/translclass.cmx bytecomp/translcore.cmx bytecomp/translmod.cmx \
-    typing/typeclass.cmx typing/typecore.cmx typing/typedecl.cmx \
-    typing/typemod.cmx typing/typetexp.cmx utils/warnings.cmx \
-    driver/opterrors.cmi 
-driver/optmain.cmo: asmcomp/arch.cmo asmcomp/asmlibrarian.cmi \
-    asmcomp/asmlink.cmi asmcomp/asmpackager.cmi utils/clflags.cmo \
-    utils/config.cmi utils/misc.cmi driver/optcompile.cmi \
-    driver/opterrors.cmi asmcomp/printmach.cmi utils/warnings.cmi \
+driver/optcompile.cmo: utils/warnings.cmi typing/typemod.cmi \
+    typing/typedtree.cmi bytecomp/translmod.cmi bytecomp/simplif.cmi \
+    typing/printtyp.cmi bytecomp/printlambda.cmi parsing/printast.cmi \
+    driver/pparse.cmi parsing/parse.cmi utils/misc.cmi typing/ident.cmi \
+    typing/env.cmi utils/config.cmi asmcomp/compilenv.cmi utils/clflags.cmo \
+    utils/ccomp.cmi asmcomp/asmgen.cmi driver/optcompile.cmi 
+driver/optcompile.cmx: utils/warnings.cmx typing/typemod.cmx \
+    typing/typedtree.cmx bytecomp/translmod.cmx bytecomp/simplif.cmx \
+    typing/printtyp.cmx bytecomp/printlambda.cmx parsing/printast.cmx \
+    driver/pparse.cmx parsing/parse.cmx utils/misc.cmx typing/ident.cmx \
+    typing/env.cmx utils/config.cmx asmcomp/compilenv.cmx utils/clflags.cmx \
+    utils/ccomp.cmx asmcomp/asmgen.cmx driver/optcompile.cmi 
+driver/opterrors.cmo: utils/warnings.cmi typing/typetexp.cmi \
+    typing/typemod.cmi typing/typedecl.cmi typing/typecore.cmi \
+    typing/typeclass.cmi bytecomp/translmod.cmi bytecomp/translcore.cmi \
+    bytecomp/translclass.cmi parsing/syntaxerr.cmi driver/pparse.cmi \
+    parsing/location.cmi parsing/lexer.cmi typing/includemod.cmi \
+    typing/env.cmi typing/ctype.cmi asmcomp/compilenv.cmi \
+    asmcomp/asmpackager.cmi asmcomp/asmlink.cmi asmcomp/asmlibrarian.cmi \
+    asmcomp/asmgen.cmi driver/opterrors.cmi 
+driver/opterrors.cmx: utils/warnings.cmx typing/typetexp.cmx \
+    typing/typemod.cmx typing/typedecl.cmx typing/typecore.cmx \
+    typing/typeclass.cmx bytecomp/translmod.cmx bytecomp/translcore.cmx \
+    bytecomp/translclass.cmx parsing/syntaxerr.cmx driver/pparse.cmx \
+    parsing/location.cmx parsing/lexer.cmx typing/includemod.cmx \
+    typing/env.cmx typing/ctype.cmx asmcomp/compilenv.cmx \
+    asmcomp/asmpackager.cmx asmcomp/asmlink.cmx asmcomp/asmlibrarian.cmx \
+    asmcomp/asmgen.cmx driver/opterrors.cmi 
+driver/optmain.cmo: utils/warnings.cmi asmcomp/printmach.cmi \
+    driver/opterrors.cmi driver/optcompile.cmi utils/misc.cmi \
+    utils/config.cmi utils/clflags.cmo asmcomp/asmpackager.cmi \
+    asmcomp/asmlink.cmi asmcomp/asmlibrarian.cmi asmcomp/arch.cmo \
     driver/optmain.cmi 
-driver/optmain.cmx: asmcomp/arch.cmx asmcomp/asmlibrarian.cmx \
-    asmcomp/asmlink.cmx asmcomp/asmpackager.cmx utils/clflags.cmx \
-    utils/config.cmx utils/misc.cmx driver/optcompile.cmx \
-    driver/opterrors.cmx asmcomp/printmach.cmx utils/warnings.cmx \
+driver/optmain.cmx: utils/warnings.cmx asmcomp/printmach.cmx \
+    driver/opterrors.cmx driver/optcompile.cmx utils/misc.cmx \
+    utils/config.cmx utils/clflags.cmx asmcomp/asmpackager.cmx \
+    asmcomp/asmlink.cmx asmcomp/asmlibrarian.cmx asmcomp/arch.cmx \
     driver/optmain.cmi 
-driver/pparse.cmo: utils/ccomp.cmi utils/clflags.cmo parsing/location.cmi \
-    utils/misc.cmi driver/pparse.cmi 
-driver/pparse.cmx: utils/ccomp.cmx utils/clflags.cmx parsing/location.cmx \
-    utils/misc.cmx driver/pparse.cmi 
-toplevel/genprintval.cmi: typing/env.cmi typing/outcometree.cmi \
-    typing/path.cmi typing/types.cmi 
+driver/pparse.cmo: utils/misc.cmi parsing/location.cmi utils/clflags.cmo \
+    utils/ccomp.cmi driver/pparse.cmi 
+driver/pparse.cmx: utils/misc.cmx parsing/location.cmx utils/clflags.cmx \
+    utils/ccomp.cmx driver/pparse.cmi 
+toplevel/genprintval.cmi: typing/types.cmi typing/path.cmi \
+    typing/outcometree.cmi typing/env.cmi 
 toplevel/topdirs.cmi: parsing/longident.cmi 
-toplevel/toploop.cmi: typing/env.cmi parsing/location.cmi \
-    parsing/longident.cmi typing/outcometree.cmi parsing/parsetree.cmi \
-    typing/path.cmi typing/types.cmi utils/warnings.cmi 
-toplevel/trace.cmi: typing/env.cmi parsing/longident.cmi typing/path.cmi \
-    typing/types.cmi 
-toplevel/expunge.cmo: bytecomp/bytesections.cmi typing/ident.cmi \
-    utils/misc.cmi bytecomp/runtimedef.cmi bytecomp/symtable.cmi 
-toplevel/expunge.cmx: bytecomp/bytesections.cmx typing/ident.cmx \
-    utils/misc.cmx bytecomp/runtimedef.cmx bytecomp/symtable.cmx 
-toplevel/genprintval.cmo: typing/btype.cmi typing/ctype.cmi \
-    typing/datarepr.cmi typing/env.cmi typing/ident.cmi parsing/longident.cmi \
-    utils/misc.cmi typing/outcometree.cmi typing/path.cmi typing/predef.cmi \
-    typing/printtyp.cmi typing/types.cmi toplevel/genprintval.cmi 
-toplevel/genprintval.cmx: typing/btype.cmx typing/ctype.cmx \
-    typing/datarepr.cmx typing/env.cmx typing/ident.cmx parsing/longident.cmx \
-    utils/misc.cmx typing/outcometree.cmi typing/path.cmx typing/predef.cmx \
-    typing/printtyp.cmx typing/types.cmx toplevel/genprintval.cmi 
-toplevel/topdirs.cmo: utils/clflags.cmo utils/config.cmi utils/consistbl.cmi \
-    typing/ctype.cmi bytecomp/dll.cmi bytecomp/emitcode.cmi typing/env.cmi \
-    typing/ident.cmi parsing/longident.cmi bytecomp/meta.cmi utils/misc.cmi \
-    bytecomp/opcodes.cmo typing/path.cmi typing/printtyp.cmi \
-    bytecomp/symtable.cmi toplevel/toploop.cmi toplevel/trace.cmi \
-    typing/types.cmi utils/warnings.cmi toplevel/topdirs.cmi 
-toplevel/topdirs.cmx: utils/clflags.cmx utils/config.cmx utils/consistbl.cmx \
-    typing/ctype.cmx bytecomp/dll.cmx bytecomp/emitcode.cmx typing/env.cmx \
-    typing/ident.cmx parsing/longident.cmx bytecomp/meta.cmx utils/misc.cmx \
-    bytecomp/opcodes.cmx typing/path.cmx typing/printtyp.cmx \
-    bytecomp/symtable.cmx toplevel/toploop.cmx toplevel/trace.cmx \
-    typing/types.cmx utils/warnings.cmx toplevel/topdirs.cmi 
-toplevel/toploop.cmo: typing/btype.cmi bytecomp/bytegen.cmi utils/clflags.cmo \
-    driver/compile.cmi utils/config.cmi utils/consistbl.cmi bytecomp/dll.cmi \
-    bytecomp/emitcode.cmi typing/env.cmi driver/errors.cmi \
-    toplevel/genprintval.cmi typing/ident.cmi parsing/lexer.cmi \
-    parsing/location.cmi parsing/longident.cmi bytecomp/meta.cmi \
-    utils/misc.cmi typing/oprint.cmi typing/outcometree.cmi parsing/parse.cmi \
-    parsing/parsetree.cmi typing/path.cmi typing/predef.cmi \
-    parsing/printast.cmi bytecomp/printinstr.cmi bytecomp/printlambda.cmi \
-    typing/printtyp.cmi bytecomp/simplif.cmi bytecomp/symtable.cmi \
-    bytecomp/translmod.cmi typing/typecore.cmi typing/typedtree.cmi \
-    typing/typemod.cmi typing/types.cmi utils/warnings.cmi \
-    toplevel/toploop.cmi 
-toplevel/toploop.cmx: typing/btype.cmx bytecomp/bytegen.cmx utils/clflags.cmx \
-    driver/compile.cmx utils/config.cmx utils/consistbl.cmx bytecomp/dll.cmx \
-    bytecomp/emitcode.cmx typing/env.cmx driver/errors.cmx \
-    toplevel/genprintval.cmx typing/ident.cmx parsing/lexer.cmx \
-    parsing/location.cmx parsing/longident.cmx bytecomp/meta.cmx \
-    utils/misc.cmx typing/oprint.cmx typing/outcometree.cmi parsing/parse.cmx \
-    parsing/parsetree.cmi typing/path.cmx typing/predef.cmx \
-    parsing/printast.cmx bytecomp/printinstr.cmx bytecomp/printlambda.cmx \
-    typing/printtyp.cmx bytecomp/simplif.cmx bytecomp/symtable.cmx \
-    bytecomp/translmod.cmx typing/typecore.cmx typing/typedtree.cmx \
-    typing/typemod.cmx typing/types.cmx utils/warnings.cmx \
-    toplevel/toploop.cmi 
-toplevel/topmain.cmo: utils/clflags.cmo utils/config.cmi driver/errors.cmi \
-    utils/misc.cmi toplevel/topdirs.cmi toplevel/toploop.cmi \
-    utils/warnings.cmi toplevel/topmain.cmi 
-toplevel/topmain.cmx: utils/clflags.cmx utils/config.cmx driver/errors.cmx \
-    utils/misc.cmx toplevel/topdirs.cmx toplevel/toploop.cmx \
-    utils/warnings.cmx toplevel/topmain.cmi 
+toplevel/toploop.cmi: utils/warnings.cmi typing/types.cmi typing/path.cmi \
+    parsing/parsetree.cmi typing/outcometree.cmi parsing/longident.cmi \
+    parsing/location.cmi typing/env.cmi 
+toplevel/trace.cmi: typing/types.cmi typing/path.cmi parsing/longident.cmi \
+    typing/env.cmi 
+toplevel/expunge.cmo: bytecomp/symtable.cmi bytecomp/runtimedef.cmi \
+    utils/misc.cmi typing/ident.cmi bytecomp/bytesections.cmi 
+toplevel/expunge.cmx: bytecomp/symtable.cmx bytecomp/runtimedef.cmx \
+    utils/misc.cmx typing/ident.cmx bytecomp/bytesections.cmx 
+toplevel/genprintval.cmo: typing/types.cmi typing/printtyp.cmi \
+    typing/predef.cmi typing/path.cmi typing/outcometree.cmi utils/misc.cmi \
+    parsing/longident.cmi typing/ident.cmi typing/env.cmi typing/datarepr.cmi \
+    typing/ctype.cmi typing/btype.cmi toplevel/genprintval.cmi 
+toplevel/genprintval.cmx: typing/types.cmx typing/printtyp.cmx \
+    typing/predef.cmx typing/path.cmx typing/outcometree.cmi utils/misc.cmx \
+    parsing/longident.cmx typing/ident.cmx typing/env.cmx typing/datarepr.cmx \
+    typing/ctype.cmx typing/btype.cmx toplevel/genprintval.cmi 
+toplevel/topdirs.cmo: utils/warnings.cmi typing/types.cmi toplevel/trace.cmi \
+    toplevel/toploop.cmi bytecomp/symtable.cmi typing/printtyp.cmi \
+    typing/path.cmi bytecomp/opcodes.cmo utils/misc.cmi bytecomp/meta.cmi \
+    parsing/longident.cmi typing/ident.cmi typing/env.cmi \
+    bytecomp/emitcode.cmi bytecomp/dll.cmi typing/ctype.cmi \
+    utils/consistbl.cmi utils/config.cmi utils/clflags.cmo \
+    toplevel/topdirs.cmi 
+toplevel/topdirs.cmx: utils/warnings.cmx typing/types.cmx toplevel/trace.cmx \
+    toplevel/toploop.cmx bytecomp/symtable.cmx typing/printtyp.cmx \
+    typing/path.cmx bytecomp/opcodes.cmx utils/misc.cmx bytecomp/meta.cmx \
+    parsing/longident.cmx typing/ident.cmx typing/env.cmx \
+    bytecomp/emitcode.cmx bytecomp/dll.cmx typing/ctype.cmx \
+    utils/consistbl.cmx utils/config.cmx utils/clflags.cmx \
+    toplevel/topdirs.cmi 
+toplevel/toploop.cmo: utils/warnings.cmi typing/types.cmi typing/typemod.cmi \
+    typing/typedtree.cmi typing/typecore.cmi bytecomp/translmod.cmi \
+    bytecomp/symtable.cmi bytecomp/simplif.cmi typing/printtyp.cmi \
+    bytecomp/printlambda.cmi bytecomp/printinstr.cmi parsing/printast.cmi \
+    typing/predef.cmi typing/path.cmi parsing/parsetree.cmi parsing/parse.cmi \
+    typing/outcometree.cmi typing/oprint.cmi utils/misc.cmi bytecomp/meta.cmi \
+    parsing/longident.cmi parsing/location.cmi parsing/lexer.cmi \
+    typing/ident.cmi toplevel/genprintval.cmi driver/errors.cmi \
+    typing/env.cmi bytecomp/emitcode.cmi bytecomp/dll.cmi utils/consistbl.cmi \
+    utils/config.cmi driver/compile.cmi utils/clflags.cmo \
+    bytecomp/bytegen.cmi typing/btype.cmi toplevel/toploop.cmi 
+toplevel/toploop.cmx: utils/warnings.cmx typing/types.cmx typing/typemod.cmx \
+    typing/typedtree.cmx typing/typecore.cmx bytecomp/translmod.cmx \
+    bytecomp/symtable.cmx bytecomp/simplif.cmx typing/printtyp.cmx \
+    bytecomp/printlambda.cmx bytecomp/printinstr.cmx parsing/printast.cmx \
+    typing/predef.cmx typing/path.cmx parsing/parsetree.cmi parsing/parse.cmx \
+    typing/outcometree.cmi typing/oprint.cmx utils/misc.cmx bytecomp/meta.cmx \
+    parsing/longident.cmx parsing/location.cmx parsing/lexer.cmx \
+    typing/ident.cmx toplevel/genprintval.cmx driver/errors.cmx \
+    typing/env.cmx bytecomp/emitcode.cmx bytecomp/dll.cmx utils/consistbl.cmx \
+    utils/config.cmx driver/compile.cmx utils/clflags.cmx \
+    bytecomp/bytegen.cmx typing/btype.cmx toplevel/toploop.cmi 
+toplevel/topmain.cmo: utils/warnings.cmi toplevel/toploop.cmi \
+    toplevel/topdirs.cmi utils/misc.cmi driver/errors.cmi utils/config.cmi \
+    utils/clflags.cmo toplevel/topmain.cmi 
+toplevel/topmain.cmx: utils/warnings.cmx toplevel/toploop.cmx \
+    toplevel/topdirs.cmx utils/misc.cmx driver/errors.cmx utils/config.cmx \
+    utils/clflags.cmx toplevel/topmain.cmi 
 toplevel/topstart.cmo: toplevel/topmain.cmi 
 toplevel/topstart.cmx: toplevel/topmain.cmx 
-toplevel/trace.cmo: typing/ctype.cmi parsing/longident.cmi bytecomp/meta.cmi \
-    utils/misc.cmi typing/path.cmi typing/predef.cmi typing/printtyp.cmi \
-    toplevel/toploop.cmi typing/types.cmi toplevel/trace.cmi 
-toplevel/trace.cmx: typing/ctype.cmx parsing/longident.cmx bytecomp/meta.cmx \
-    utils/misc.cmx typing/path.cmx typing/predef.cmx typing/printtyp.cmx \
-    toplevel/toploop.cmx typing/types.cmx toplevel/trace.cmi 
+toplevel/trace.cmo: typing/types.cmi toplevel/toploop.cmi typing/printtyp.cmi \
+    typing/predef.cmi typing/path.cmi utils/misc.cmi bytecomp/meta.cmi \
+    parsing/longident.cmi typing/ctype.cmi toplevel/trace.cmi 
+toplevel/trace.cmx: typing/types.cmx toplevel/toploop.cmx typing/printtyp.cmx \
+    typing/predef.cmx typing/path.cmx utils/misc.cmx bytecomp/meta.cmx \
+    parsing/longident.cmx typing/ctype.cmx toplevel/trace.cmi 

diff --git a/CVS/Entries b/CVS/Entries
new file mode 100644 (file)
index 0000000..095684e
--- /dev/null
+++ b/CVS/Entries
@@ -0,0 +1,12 @@
+/.cvsignore/1.11/Thu Aug 28 08:38:52 2003//Tocaml3083
+/.depend/1.122.4.2/Tue Feb 22 14:33:34 2005//Tocaml3083
+/Changes/1.140.2.9/Wed Mar 16 12:05:28 2005//Tocaml3083
+/INSTALL/1.42.4.2/Fri Jul  2 11:11:27 2004//Tocaml3083
+/LICENSE/1.17.4.3/Thu Aug 12 12:37:29 2004//Tocaml3083
+/Makefile/1.186.2.7/Mon Jan 31 10:30:47 2005//Tocaml3083
+/Makefile.nt/1.94.4.1/Mon Nov 29 08:50:45 2004//Tocaml3083
+/README/1.42.2.2/Tue Jul 13 07:35:45 2004//Tocaml3083
+/README.win32/1.34.2.2/Tue Jul 13 07:59:58 2004//Tocaml3083
+/Upgrading/1.3.8.1/Fri Jul  2 09:37:16 2004//Tocaml3083
+/configure/1.215.2.9/Mon Jan 24 15:22:46 2005//Tocaml3083
+D

diff --git a/CVS/Entries.Log b/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..2f18bea
--- /dev/null
+++ b/CVS/Entries.Log
@@ -0,0 +1,24 @@
+A D/asmcomp////
+A D/asmrun////
+A D/boot////
+A D/bytecomp////
+A D/byterun////
+A D/camlp4////
+A D/config////
+A D/debugger////
+A D/driver////
+A D/emacs////
+A D/lex////
+A D/maccaml////
+A D/man////
+A D/ocamldoc////
+A D/otherlibs////
+A D/parsing////
+A D/stdlib////
+A D/tools////
+A D/toplevel////
+A D/typing////
+A D/utils////
+A D/win32caml////
+A D/yacc////
+R D/maccaml////

diff --git a/CVS/Repository b/CVS/Repository
new file mode 100644 (file)
index 0000000..e57fe3a
--- /dev/null
+++ b/CVS/Repository
@@ -0,0 +1 @@
+csl

diff --git a/CVS/Root b/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/CVS/Tag b/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/Changes b/Changes
index e0ce39f0009e0f415ff1f83dd7e054df361590d6..b211297934267de0ebb3c63ac2270a267f58d3c4 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,49 @@
+Objective Caml 3.08.3:
+----------------------
+
+New features:
+- support for ocamlopt -pack under Mac OS X (PR#2634, PR#3320)
+- ignore unknown warning options for forward and backward compatibility
+- runtime: export caml_compare_unordered (PR#3479)
+- camlp4: install argl.* files (PR#3439)
+- ocamldoc: add -man-section option
+- labltk: add the "solid" relief option (PR#3343)
+- compiler: ocamlc -i now prints variance annotations
+
+Bug fixes:
+- typing: fix unsoundness in type declaration variance inference.
+    Type parameters which are constrained must now have an explicit variant
+    annotation, otherwise they are invariant. This is not backward
+    compatible, so this might break code which either uses subtyping or
+    uses the relaxed value restriction (i.e. was not typable before 3.07)
+- typing: erroneous partial match warning for polymorphic variants (PR#3424)
+- runtime: handle the case of an empty command line (PR#3409, PR#3444)
+- stdlib: make Sys.executable_name an absolute path in native code (PR#3303)
+- runtime: fix memory leak in finalise.c
+- runtime: auto-trigger compaction even if gc is called manually (PR#3392)
+- stdlib: fix segfault in Obj.dup on zero-sized values (PR#3406)
+- camlp4: correct parsing of the $ identifier (PR#3310, PR#3469)
+- windows (MS tools): use link /lib instead of lib (PR#3333)
+- windows (MS tools): change default install destination
+- autoconf: better checking of SSE2 instructions (PR#3329, PR#3330)
+- graphics: make close_graph close the X display as well as the window (PR#3312)
+- num: fix big_int_of_string (empty string) (PR#3483)
+- num: fix big bug on 64-bit architecture (PR#3299)
+- str: better documentation of string_match and string_partial_match (PR#3395)
+- unix: fix file descriptor leak in Unix.accept (PR#3423)
+- unix: miscellaneous clean-ups
+- unix: fix documentation of Unix.tm (PR#3341)
+- graphics: fix problem when allocating lots of images under Windows (PR#3433)
+- compiler: fix error message with -pack when .cmi is missing (PR#3028)
+- cygwin: fix problem with compilation of camlheader (PR#3485)
+- stdlib: Filename.basename doesn't return an empty string any more (PR#3451)
+- stdlib: better documentation of Open_excl flag (PR#3450)
+- ocamlcp: accept -thread option (PR#3511)
+- ocamldep: handle spaces in file names (PR#3370)
+- compiler: remove spurious warning in pattern-matching on variants (PR#3424)
+- windows: better handling of InterpreterPath registry entry (PR#3334, PR#3432)
+
+
 Objective Caml 3.08.2:
 ----------------------
 
@@ -1804,4 +1850,4 @@ Caml Special Light 1.06:
 
 * First public release.
 
-$Id: Changes,v 1.140.2.5 2004/11/19 15:36:18 doligez Exp $
+$Id: Changes,v 1.140.2.9 2005/03/16 12:05:28 doligez Exp $

diff --git a/Makefile b/Makefile
index 0905016876ed254b9c8a006b854de8cd127d2b3d..b1f5829c351be3c09c9b8d4edc6437aaed501360 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile,v 1.186.2.4 2004/07/16 16:11:33 doligez Exp $
+# $Id: Makefile,v 1.186.2.7 2005/01/31 10:30:47 doligez Exp $
 
 # The main Makefile
 
@@ -628,12 +628,16 @@ checkstack:
 .PHONY: package-macosx
 
 package-macosx:
-       make BINDIR="`pwd`"/package-macosx/root$(BINDIR) \
-            LIBDIR="`pwd`"/package-macosx/root$(LIBDIR) \
-            MANDIR="`pwd`"/package-macosx/root$(MANDIR) install
+       sudo rm -rf package-macosx/root
+       make BINDIR="`pwd`"/package-macosx/root/bin \
+            LIBDIR="`pwd`"/package-macosx/root/lib/ocaml \
+            MANDIR="`pwd`"/package-macosx/root/man \
+             install
        tools/make-package-macosx
+       sudo rm -rf package-macosx/root
+
 clean::
-       rm -rf package-macosx/root package-macosx/*.pkg package-macosx/*.dmg
+       rm -rf package-macosx/*.pkg package-macosx/*.dmg
 
 # Default rules
 

diff --git a/Makefile.nt b/Makefile.nt
index 9c81896181114751f7d4a0d3d31352c0043974da..c4c66259c842252b9ae17d585028c361e061ea38 100644 (file)
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -10,7 +10,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile.nt,v 1.94 2003/09/25 08:19:17 xleroy Exp $
+# $Id: Makefile.nt,v 1.94.4.1 2004/11/29 08:50:45 xleroy Exp $
 
 # The main Makefile
 
@@ -228,8 +228,8 @@ installbyt:
        for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i install; done
        cd win32caml ; $(MAKE) install
        cd camlp4 ; make install
-       cp README $(DISTRIB)/Readme.gen
-       cp README.win32 $(DISTRIB)/Readme.win
+       cp README $(DISTRIB)/Readme.general.txt
+       cp README.win32 $(DISTRIB)/Readme.windows.txt
        cp LICENSE $(DISTRIB)/License.txt
        cp Changes $(DISTRIB)/Changes.txt
 

diff --git a/asmcomp/CVS/Entries b/asmcomp/CVS/Entries
new file mode 100644 (file)
index 0000000..5d12e97
--- /dev/null
+++ b/asmcomp/CVS/Entries
@@ -0,0 +1,59 @@
+/.cvsignore/1.2/Fri Jan 18 15:13:17 2002//Tocaml3083
+/asmgen.ml/1.19/Fri Apr 21 08:10:25 2000//Tocaml3083
+/asmgen.mli/1.7/Fri Apr 21 08:10:26 2000//Tocaml3083
+/asmlibrarian.ml/1.13/Thu Apr  4 09:00:16 2002//Tocaml3083
+/asmlibrarian.mli/1.6/Fri Apr 21 08:10:27 2000//Tocaml3083
+/asmlink.ml/1.65/Wed May 26 11:10:27 2004//Tocaml3083
+/asmlink.mli/1.10/Tue Jun 11 14:15:11 2002//Tocaml3083
+/asmpackager.ml/1.14.4.2/Mon Jan 24 15:22:46 2005//Tocaml3083
+/asmpackager.mli/1.1/Fri Feb  8 16:55:30 2002//Tocaml3083
+/clambda.ml/1.16/Wed May 26 11:10:27 2004//Tocaml3083
+/clambda.mli/1.16/Wed May 26 11:10:27 2004//Tocaml3083
+/closure.ml/1.44/Wed May 26 11:10:27 2004//Tocaml3083
+/closure.mli/1.5/Wed Nov 17 18:56:30 1999//Tocaml3083
+/cmm.ml/1.20/Sun Nov 24 15:55:24 2002//Tocaml3083
+/cmm.mli/1.20/Sun Nov 24 15:55:24 2002//Tocaml3083
+/cmmgen.ml/1.100/Wed May 26 11:10:27 2004//Tocaml3083
+/cmmgen.mli/1.12/Wed May 26 11:10:28 2004//Tocaml3083
+/codegen.ml/1.7/Fri Apr 21 08:10:29 2000//Tocaml3083
+/codegen.mli/1.4/Wed Nov 17 18:56:31 1999//Tocaml3083
+/coloring.ml/1.12/Thu Dec 28 13:02:49 2000//Tocaml3083
+/coloring.mli/1.4/Wed Nov 17 18:56:31 1999//Tocaml3083
+/comballoc.ml/1.3/Fri Aug 11 19:50:50 2000//Tocaml3083
+/comballoc.mli/1.2/Wed Nov 17 18:56:32 1999//Tocaml3083
+/compilenv.ml/1.21/Wed May 26 11:10:28 2004//Tocaml3083
+/compilenv.mli/1.14/Wed May 26 11:10:28 2004//Tocaml3083
+/emit.mli/1.5/Wed Nov 17 18:56:32 1999//Tocaml3083
+/emitaux.ml/1.11/Wed Nov 17 18:56:33 1999//Tocaml3083
+/emitaux.mli/1.11/Sat Jul  5 11:12:39 2003//Tocaml3083
+/interf.ml/1.14/Sat May  8 15:04:03 2004//Tocaml3083
+/interf.mli/1.4/Wed Nov 17 18:56:33 1999//Tocaml3083
+/linearize.ml/1.24/Wed Jan  9 19:40:48 2002//Tocaml3083
+/linearize.mli/1.13/Wed Jan  9 19:40:48 2002//Tocaml3083
+/liveness.ml/1.14/Fri Aug 11 19:50:52 2000//Tocaml3083
+/liveness.mli/1.5/Fri Apr 21 08:10:33 2000//Tocaml3083
+/mach.ml/1.17/Fri Aug 11 19:50:52 2000//Tocaml3083
+/mach.mli/1.17/Fri Aug 11 19:50:53 2000//Tocaml3083
+/printcmm.ml/1.24/Sun Nov 24 15:55:24 2002//Tocaml3083
+/printcmm.mli/1.6/Fri Apr 21 08:10:34 2000//Tocaml3083
+/printlinear.ml/1.12/Fri Apr 21 08:10:35 2000//Tocaml3083
+/printlinear.mli/1.5/Fri Apr 21 08:10:35 2000//Tocaml3083
+/printmach.ml/1.22/Fri Aug 11 19:50:54 2000//Tocaml3083
+/printmach.mli/1.6/Fri Apr 21 08:10:37 2000//Tocaml3083
+/proc.mli/1.16/Wed Nov 17 18:56:35 1999//Tocaml3083
+/reg.ml/1.10/Thu Jun 29 11:44:06 2000//Tocaml3083
+/reg.mli/1.7/Wed Nov 17 18:56:35 1999//Tocaml3083
+/reload.mli/1.6/Wed Nov 17 18:56:35 1999//Tocaml3083
+/reloadgen.ml/1.5/Fri Aug 11 19:50:55 2000//Tocaml3083
+/reloadgen.mli/1.4/Wed Nov 17 18:56:36 1999//Tocaml3083
+/schedgen.ml/1.10/Thu Dec 28 13:02:54 2000//Tocaml3083
+/schedgen.mli/1.6/Wed Nov 17 18:56:36 1999//Tocaml3083
+/scheduling.mli/1.3/Wed Nov 17 18:56:36 1999//Tocaml3083
+/selectgen.ml/1.30/Tue Feb 25 15:50:12 2003//Tocaml3083
+/selectgen.mli/1.6/Mon Nov  4 16:25:09 2002//Tocaml3083
+/selection.mli/1.6/Wed Nov 17 18:56:37 1999//Tocaml3083
+/spill.ml/1.18/Mon Feb 19 20:15:42 2001//Tocaml3083
+/spill.mli/1.4/Wed Nov 17 18:56:38 1999//Tocaml3083
+/split.ml/1.9/Fri Aug 11 19:50:59 2000//Tocaml3083
+/split.mli/1.4/Wed Nov 17 18:56:38 1999//Tocaml3083
+D

diff --git a/asmcomp/CVS/Entries.Log b/asmcomp/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..36972dd
--- /dev/null
+++ b/asmcomp/CVS/Entries.Log
@@ -0,0 +1,10 @@
+A D/alpha////
+A D/amd64////
+A D/arm////
+A D/hppa////
+A D/i386////
+A D/ia64////
+A D/m68k////
+A D/mips////
+A D/power////
+A D/sparc////

diff --git a/asmcomp/CVS/Repository b/asmcomp/CVS/Repository
new file mode 100644 (file)
index 0000000..b92c542
--- /dev/null
+++ b/asmcomp/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp

diff --git a/asmcomp/CVS/Root b/asmcomp/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/CVS/Tag b/asmcomp/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/alpha/CVS/Entries b/asmcomp/alpha/CVS/Entries
new file mode 100644 (file)
index 0000000..987b57c
--- /dev/null
+++ b/asmcomp/alpha/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.10/Fri Nov 29 15:03:36 2002//Tocaml3083
+/emit.mlp/1.40/Mon May  3 12:46:50 2004//Tocaml3083
+/proc.ml/1.6/Mon Jul 22 16:37:46 2002//Tocaml3083
+/reload.ml/1.3/Wed Nov 17 18:56:40 1999//Tocaml3083
+/scheduling.ml/1.6/Wed Nov 17 18:56:40 1999//Tocaml3083
+/selection.ml/1.12/Tue Jul 24 08:01:25 2001//Tocaml3083
+D

diff --git a/asmcomp/alpha/CVS/Repository b/asmcomp/alpha/CVS/Repository
new file mode 100644 (file)
index 0000000..495a12f
--- /dev/null
+++ b/asmcomp/alpha/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/alpha

diff --git a/asmcomp/alpha/CVS/Root b/asmcomp/alpha/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/alpha/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/alpha/CVS/Tag b/asmcomp/alpha/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/alpha/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/amd64/CVS/Entries b/asmcomp/amd64/CVS/Entries
new file mode 100644 (file)
index 0000000..b793abe
--- /dev/null
+++ b/asmcomp/amd64/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.1/Mon Jun 30 08:28:44 2003//Tocaml3083
+/emit.mlp/1.6.6.1/Thu Jul  1 16:09:03 2004//Tocaml3083
+/proc.ml/1.1/Mon Jun 30 08:28:44 2003//Tocaml3083
+/reload.ml/1.1/Mon Jun 30 08:28:44 2003//Tocaml3083
+/scheduling.ml/1.1/Mon Jun 30 08:28:44 2003//Tocaml3083
+/selection.ml/1.2/Mon Jun 30 11:29:26 2003//Tocaml3083
+D

diff --git a/asmcomp/amd64/CVS/Repository b/asmcomp/amd64/CVS/Repository
new file mode 100644 (file)
index 0000000..314bfb2
--- /dev/null
+++ b/asmcomp/amd64/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/amd64

diff --git a/asmcomp/amd64/CVS/Root b/asmcomp/amd64/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/amd64/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/amd64/CVS/Tag b/asmcomp/amd64/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/amd64/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/arm/CVS/Entries b/asmcomp/arm/CVS/Entries
new file mode 100644 (file)
index 0000000..78d6f10
--- /dev/null
+++ b/asmcomp/arm/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.9/Fri Nov 29 15:03:36 2002//Tocaml3083
+/emit.mlp/1.18/Mon May  3 12:46:50 2004//Tocaml3083
+/proc.ml/1.8/Mon Jul 22 16:37:47 2002//Tocaml3083
+/reload.ml/1.4/Wed Nov 17 18:56:41 1999//Tocaml3083
+/scheduling.ml/1.4/Wed Nov 17 18:56:41 1999//Tocaml3083
+/selection.ml/1.6/Fri Mar 30 12:22:32 2001//Tocaml3083
+D

diff --git a/asmcomp/arm/CVS/Repository b/asmcomp/arm/CVS/Repository
new file mode 100644 (file)
index 0000000..00d97fc
--- /dev/null
+++ b/asmcomp/arm/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/arm

diff --git a/asmcomp/arm/CVS/Root b/asmcomp/arm/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/arm/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/arm/CVS/Tag b/asmcomp/arm/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/arm/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml
index 2617de5a60b5162c17be64c9b3222f7e876c3b7d..c54bfeca93c5123739c67bfd71453ab480e481d9 100644 (file)
--- a/asmcomp/asmpackager.ml
+++ b/asmcomp/asmpackager.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: asmpackager.ml,v 1.14.4.1 2004/08/10 12:16:47 xleroy Exp $ *)
+(* $Id: asmpackager.ml,v 1.14.4.2 2005/01/24 15:22:46 doligez Exp $ *)
 
 (* "Package" a set of .cmx/.o files into one .cmx/.o file having the
    original compilation units as sub-modules. *)
@@ -85,7 +85,8 @@ let extract_symbols units symbolfile =
       try
         let i = 3 + (try search_substring " T " l 0 with Not_found -> 
                      try search_substring " D " l 0 with Not_found ->
-                     search_substring " R " l 0) in
+                     try search_substring " R " l 0 with Not_found ->
+                     search_substring " S " l 0) in
         let j = try search_substring "__" l i
                 with Not_found -> String.length l in
         let k = if l.[i] = '_' then i + 1 else i in

diff --git a/asmcomp/hppa/CVS/Entries b/asmcomp/hppa/CVS/Entries
new file mode 100644 (file)
index 0000000..bbbaaa6
--- /dev/null
+++ b/asmcomp/hppa/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.7/Fri Nov 29 15:03:36 2002//Tocaml3083
+/emit.mlp/1.19/Sun May 16 09:09:23 2004//Tocaml3083
+/proc.ml/1.7/Sun May  9 15:19:16 2004//Tocaml3083
+/reload.ml/1.3/Wed Nov 17 18:56:42 1999//Tocaml3083
+/scheduling.ml/1.4/Wed Nov 17 18:56:42 1999//Tocaml3083
+/selection.ml/1.5/Wed Nov 17 18:56:42 1999//Tocaml3083
+D

diff --git a/asmcomp/hppa/CVS/Repository b/asmcomp/hppa/CVS/Repository
new file mode 100644 (file)
index 0000000..c2a219d
--- /dev/null
+++ b/asmcomp/hppa/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/hppa

diff --git a/asmcomp/hppa/CVS/Root b/asmcomp/hppa/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/hppa/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/hppa/CVS/Tag b/asmcomp/hppa/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/hppa/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/i386/CVS/Entries b/asmcomp/i386/CVS/Entries
new file mode 100644 (file)
index 0000000..6893611
--- /dev/null
+++ b/asmcomp/i386/CVS/Entries
@@ -0,0 +1,9 @@
+/arch.ml/1.12/Tue Feb 25 15:50:12 2003//Tocaml3083
+/emit.mlp/1.32/Mon May  3 12:46:50 2004//Tocaml3083
+/emit_nt.mlp/1.24/Mon May  3 12:46:50 2004//Tocaml3083
+/proc.ml/1.8/Sun Jun 15 09:58:31 2003//Tocaml3083
+/proc_nt.ml/1.5/Tue Mar 12 16:17:52 2002//Tocaml3083
+/reload.ml/1.5/Fri Nov 22 15:09:18 2002//Tocaml3083
+/scheduling.ml/1.3/Fri Feb  4 12:43:18 2000//Tocaml3083
+/selection.ml/1.13/Tue Feb 25 15:50:13 2003//Tocaml3083
+D

diff --git a/asmcomp/i386/CVS/Repository b/asmcomp/i386/CVS/Repository
new file mode 100644 (file)
index 0000000..b58bb38
--- /dev/null
+++ b/asmcomp/i386/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/i386

diff --git a/asmcomp/i386/CVS/Root b/asmcomp/i386/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/i386/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/i386/CVS/Tag b/asmcomp/i386/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/i386/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/ia64/CVS/Entries b/asmcomp/ia64/CVS/Entries
new file mode 100644 (file)
index 0000000..cd2b799
--- /dev/null
+++ b/asmcomp/ia64/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.5/Fri Nov 29 15:03:36 2002//Tocaml3083
+/emit.mlp/1.16.4.1/Mon Jul 12 15:03:19 2004//Tocaml3083
+/proc.ml/1.5/Mon Jul 22 16:37:52 2002//Tocaml3083
+/reload.ml/1.2/Sun Jul 16 02:57:31 2000//Tocaml3083
+/scheduling.ml/1.3/Sun Jul 16 02:57:31 2000//Tocaml3083
+/selection.ml/1.7/Mon May  3 12:27:07 2004//Tocaml3083
+D

diff --git a/asmcomp/ia64/CVS/Repository b/asmcomp/ia64/CVS/Repository
new file mode 100644 (file)
index 0000000..7d2f122
--- /dev/null
+++ b/asmcomp/ia64/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/ia64

diff --git a/asmcomp/ia64/CVS/Root b/asmcomp/ia64/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/ia64/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/ia64/CVS/Tag b/asmcomp/ia64/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/ia64/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/m68k/CVS/Entries b/asmcomp/m68k/CVS/Entries
new file mode 100644 (file)
index 0000000..8a31806
--- /dev/null
+++ b/asmcomp/m68k/CVS/Entries
@@ -0,0 +1,2 @@
+/README/1.1/Fri Feb  4 15:34:43 2000//Tocaml3083
+D

diff --git a/asmcomp/m68k/CVS/Repository b/asmcomp/m68k/CVS/Repository
new file mode 100644 (file)
index 0000000..636daa9
--- /dev/null
+++ b/asmcomp/m68k/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/m68k

diff --git a/asmcomp/m68k/CVS/Root b/asmcomp/m68k/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/m68k/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/m68k/CVS/Tag b/asmcomp/m68k/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/m68k/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/mips/CVS/Entries b/asmcomp/mips/CVS/Entries
new file mode 100644 (file)
index 0000000..e824425
--- /dev/null
+++ b/asmcomp/mips/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.6/Fri Nov 29 15:03:36 2002//Tocaml3083
+/emit.mlp/1.18/Mon Jan  5 20:25:56 2004//Tocaml3083
+/proc.ml/1.6/Mon Jul 22 16:37:52 2002//Tocaml3083
+/reload.ml/1.3/Wed Nov 17 18:56:45 1999//Tocaml3083
+/scheduling.ml/1.2/Wed Nov 17 18:56:45 1999//Tocaml3083
+/selection.ml/1.4/Wed Nov 17 18:56:46 1999//Tocaml3083
+D

diff --git a/asmcomp/mips/CVS/Repository b/asmcomp/mips/CVS/Repository
new file mode 100644 (file)
index 0000000..cf72e07
--- /dev/null
+++ b/asmcomp/mips/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/mips

diff --git a/asmcomp/mips/CVS/Root b/asmcomp/mips/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/mips/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/mips/CVS/Tag b/asmcomp/mips/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/mips/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/power/CVS/Entries b/asmcomp/power/CVS/Entries
new file mode 100644 (file)
index 0000000..bb54e5a
--- /dev/null
+++ b/asmcomp/power/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.11/Sat Jun 19 16:13:32 2004//Tocaml3083
+/emit.mlp/1.21/Sat Jun 19 17:39:34 2004//Tocaml3083
+/proc.ml/1.12/Sat Jun 19 17:39:35 2004//Tocaml3083
+/reload.ml/1.3/Wed Nov 17 18:56:46 1999//Tocaml3083
+/scheduling.ml/1.6/Sat Jun 19 16:13:33 2004//Tocaml3083
+/selection.ml/1.6/Sat Jun 19 16:13:33 2004//Tocaml3083
+D

diff --git a/asmcomp/power/CVS/Repository b/asmcomp/power/CVS/Repository
new file mode 100644 (file)
index 0000000..0c25f47
--- /dev/null
+++ b/asmcomp/power/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/power

diff --git a/asmcomp/power/CVS/Root b/asmcomp/power/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/power/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/power/CVS/Tag b/asmcomp/power/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/power/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmcomp/sparc/CVS/Entries b/asmcomp/sparc/CVS/Entries
new file mode 100644 (file)
index 0000000..894572d
--- /dev/null
+++ b/asmcomp/sparc/CVS/Entries
@@ -0,0 +1,7 @@
+/arch.ml/1.8/Fri Nov 29 15:03:08 2002//Tocaml3083
+/emit.mlp/1.21/Mon Jan  5 20:25:56 2004//Tocaml3083
+/proc.ml/1.7/Fri Nov 29 15:03:08 2002//Tocaml3083
+/reload.ml/1.3/Wed Nov 17 18:56:47 1999//Tocaml3083
+/scheduling.ml/1.5/Fri Nov 29 15:03:08 2002//Tocaml3083
+/selection.ml/1.8/Fri Nov 29 15:03:08 2002//Tocaml3083
+D

diff --git a/asmcomp/sparc/CVS/Repository b/asmcomp/sparc/CVS/Repository
new file mode 100644 (file)
index 0000000..f662bb4
--- /dev/null
+++ b/asmcomp/sparc/CVS/Repository
@@ -0,0 +1 @@
+csl/asmcomp/sparc

diff --git a/asmcomp/sparc/CVS/Root b/asmcomp/sparc/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmcomp/sparc/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmcomp/sparc/CVS/Tag b/asmcomp/sparc/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmcomp/sparc/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmrun/CVS/Entries b/asmrun/CVS/Entries
new file mode 100644 (file)
index 0000000..84f63c6
--- /dev/null
+++ b/asmrun/CVS/Entries
@@ -0,0 +1,23 @@
+/.cvsignore/1.1/Fri Jan 18 15:13:17 2002//Tocaml3083
+/.depend/1.41.4.1/Fri Jul  9 15:55:09 2004//Tocaml3083
+/Makefile/1.51/Sun May  9 15:19:16 2004//Tocaml3083
+/Makefile.nt/1.20/Tue Jun 18 16:17:34 2002//Tocaml3083
+/alpha.S/1.29/Sat Jan  3 12:51:18 2004//Tocaml3083
+/amd64.S/1.8.4.1/Thu Jul  1 16:09:03 2004//Tocaml3083
+/arm.S/1.15/Sat Jan  3 12:51:18 2004//Tocaml3083
+/fail.c/1.37/Mon May 17 17:25:52 2004//Tocaml3083
+/hppa.S/1.25/Sun May 16 09:09:22 2004//Tocaml3083
+/i386.S/1.42/Sat Jan  3 12:51:19 2004//Tocaml3083
+/i386nt.asm/1.17/Tue May  4 09:02:47 2004//Tocaml3083
+/ia64.S/1.13/Sat Jan  3 12:51:19 2004//Tocaml3083
+/m68k.S/1.15/Sat Jan  3 12:51:19 2004//Tocaml3083
+/mips.s/1.11.4.1/Tue Jul 13 08:01:59 2004//Tocaml3083
+/power-aix.S/1.15/Sat Jan  3 12:51:19 2004//Tocaml3083
+/power-elf.S/1.18/Sat Jan  3 12:51:19 2004//Tocaml3083
+/power-rhapsody.S/1.13/Sun Feb 22 14:56:25 2004//Tocaml3083
+/roots.c/1.37/Fri Jan  2 19:22:19 2004//Tocaml3083
+/signals.c/1.81/Sat Jun 19 16:13:32 2004//Tocaml3083
+/sparc.S/1.24.4.1/Wed Oct  6 09:02:36 2004//Tocaml3083
+/stack.h/1.28/Tue Dec 16 18:09:04 2003//Tocaml3083
+/startup.c/1.30.4.3/Wed Mar 16 12:05:28 2005//Tocaml3083
+D

diff --git a/asmrun/CVS/Repository b/asmrun/CVS/Repository
new file mode 100644 (file)
index 0000000..13b8a76
--- /dev/null
+++ b/asmrun/CVS/Repository
@@ -0,0 +1 @@
+csl/asmrun

diff --git a/asmrun/CVS/Root b/asmrun/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/asmrun/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/asmrun/CVS/Tag b/asmrun/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/asmrun/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/asmrun/startup.c b/asmrun/startup.c
index 4232cf9bba2f2835a320aada2444d5c2a01c1d6b..7338cead5dd019fe0d04c08408336ea29c2789a4 100644 (file)
--- a/asmrun/startup.c
+++ b/asmrun/startup.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: startup.c,v 1.30 2004/01/02 19:22:19 doligez Exp $ */
+/* $Id: startup.c,v 1.30.4.3 2005/03/16 12:05:28 doligez Exp $ */
 
 /* Start-up code */
 
@@ -139,9 +139,14 @@ void caml_main(char **argv)
   init_atoms();
   caml_init_signals();
   exe_name = argv[0];
+  if (exe_name == NULL) exe_name = "";
 #ifdef __linux__
   if (caml_executable_name(proc_self_exe, sizeof(proc_self_exe)) == 0)
     exe_name = proc_self_exe;
+  else
+    exe_name = caml_search_exe_in_path(exe_name);
+#else
+  exe_name = caml_search_exe_in_path(exe_name);
 #endif
   caml_sys_init(exe_name, argv);
   if (sigsetjmp(caml_termination_jmpbuf.buf, 0)) {

diff --git a/boot/CVS/Entries b/boot/CVS/Entries
new file mode 100644 (file)
index 0000000..b6b03c3
--- /dev/null
+++ b/boot/CVS/Entries
@@ -0,0 +1,4 @@
+/.cvsignore/1.4/Thu Oct 10 11:58:28 1996//Tocaml3083
+/ocamlc/1.319.2.12/Wed Mar 16 12:05:28 2005/-kb/Tocaml3083
+/ocamllex/1.251.2.10/Wed Mar 16 12:05:32 2005/-kb/Tocaml3083
+D

diff --git a/boot/CVS/Repository b/boot/CVS/Repository
new file mode 100644 (file)
index 0000000..1e0a06a
--- /dev/null
+++ b/boot/CVS/Repository
@@ -0,0 +1 @@
+csl/boot

diff --git a/boot/CVS/Root b/boot/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/boot/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/boot/CVS/Tag b/boot/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/boot/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/boot/ocamlc b/boot/ocamlc
index e0a85b893ea794aa93b901e5586caacd5f0fe79b..f28ffb492d505bf4f60fd5bd5e41c5727e24d229 100755 (executable)
Binary files a/boot/ocamlc and b/boot/ocamlc differ

diff --git a/boot/ocamllex b/boot/ocamllex
index a221cfc5ef0787f10a1f5015285d0bfd0a1388ce..ae8698a208e6487f03baf64042862e8d6d002d4c 100755 (executable)
Binary files a/boot/ocamllex and b/boot/ocamllex differ

diff --git a/bytecomp/CVS/Entries b/bytecomp/CVS/Entries
new file mode 100644 (file)
index 0000000..0d330cf
--- /dev/null
+++ b/bytecomp/CVS/Entries
@@ -0,0 +1,45 @@
+/.cvsignore/1.1/Tue Aug 29 08:33:13 1995//Tocaml3083
+/bytegen.ml/1.65.2.1/Wed Jul  7 16:49:51 2004//Tocaml3083
+/bytegen.mli/1.6/Wed Nov 17 18:56:59 1999//Tocaml3083
+/bytelibrarian.ml/1.18/Thu Apr 18 22:55:36 2002//Tocaml3083
+/bytelibrarian.mli/1.6/Mon Mar  6 22:11:06 2000//Tocaml3083
+/bytelink.ml/1.83.4.1/Fri Jul  2 09:10:50 2004//Tocaml3083
+/bytelink.mli/1.11/Tue Jun 11 14:15:11 2002//Tocaml3083
+/bytepackager.ml/1.4/Fri Apr  9 13:32:27 2004//Tocaml3083
+/bytepackager.mli/1.1/Fri Feb  8 16:55:42 2002//Tocaml3083
+/bytesections.ml/1.3/Sun Feb 22 15:07:50 2004//Tocaml3083
+/bytesections.mli/1.3/Sun Feb 22 15:07:50 2004//Tocaml3083
+/dll.ml/1.12/Fri Jan 16 15:24:02 2004//Tocaml3083
+/dll.mli/1.5/Tue Jul  2 16:13:12 2002//Tocaml3083
+/emitcode.ml/1.32/Wed May 26 11:10:50 2004//Tocaml3083
+/emitcode.mli/1.14/Thu Mar  6 15:59:54 2003//Tocaml3083
+/instruct.ml/1.21/Wed May 26 11:10:50 2004//Tocaml3083
+/instruct.mli/1.20/Wed May 26 11:10:50 2004//Tocaml3083
+/lambda.ml/1.40.2.1/Wed Jul  7 16:49:51 2004//Tocaml3083
+/lambda.mli/1.38.2.1/Wed Jul  7 16:49:53 2004//Tocaml3083
+/matching.ml/1.60/Thu Apr 29 12:38:11 2004//Tocaml3083
+/matching.mli/1.12/Wed May 26 11:10:50 2004//Tocaml3083
+/meta.ml/1.13/Fri Apr 16 13:46:20 2004//Tocaml3083
+/meta.mli/1.13/Fri Apr 16 13:46:27 2004//Tocaml3083
+/printinstr.ml/1.22/Wed May 26 11:10:50 2004//Tocaml3083
+/printinstr.mli/1.5/Mon Mar  6 22:11:08 2000//Tocaml3083
+/printlambda.ml/1.49/Wed May 26 11:10:50 2004//Tocaml3083
+/printlambda.mli/1.5/Mon Mar  6 22:11:10 2000//Tocaml3083
+/runtimedef.mli/1.4/Wed Nov 17 18:57:01 1999//Tocaml3083
+/simplif.ml/1.23/Wed May 26 11:10:50 2004//Tocaml3083
+/simplif.mli/1.3/Wed Nov 17 18:57:01 1999//Tocaml3083
+/switch.ml/1.9/Tue Oct  1 12:49:52 2002//Tocaml3083
+/switch.mli/1.5/Fri Sep 21 15:59:15 2001//Tocaml3083
+/symtable.ml/1.37/Sun Feb 22 15:07:50 2004//Tocaml3083
+/symtable.mli/1.14/Sun Feb 22 15:07:50 2004//Tocaml3083
+/translclass.ml/1.32/Wed May 26 11:10:50 2004//Tocaml3083
+/translclass.mli/1.10/Wed May 26 11:10:50 2004//Tocaml3083
+/translcore.ml/1.96/Wed May 26 11:10:50 2004//Tocaml3083
+/translcore.mli/1.18/Tue Nov 25 09:20:43 2003//Tocaml3083
+/translmod.ml/1.50/Sat Jun 12 08:55:45 2004//Tocaml3083
+/translmod.mli/1.12/Fri Apr  9 13:32:27 2004//Tocaml3083
+/translobj.ml/1.9/Wed May 26 11:10:51 2004//Tocaml3083
+/translobj.mli/1.6/Wed May 26 11:10:51 2004//Tocaml3083
+/typeopt.ml/1.10/Fri Apr 16 00:50:23 2004//Tocaml3083
+/typeopt.mli/1.4/Mon Feb 28 15:45:50 2000//Tocaml3083
+D

diff --git a/bytecomp/CVS/Repository b/bytecomp/CVS/Repository
new file mode 100644 (file)
index 0000000..7219db2
--- /dev/null
+++ b/bytecomp/CVS/Repository
@@ -0,0 +1 @@
+csl/bytecomp

diff --git a/bytecomp/CVS/Root b/bytecomp/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/bytecomp/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/bytecomp/CVS/Tag b/bytecomp/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/bytecomp/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/byterun/CVS/Entries b/byterun/CVS/Entries
new file mode 100644 (file)
index 0000000..3f5c5a1
--- /dev/null
+++ b/byterun/CVS/Entries
@@ -0,0 +1,91 @@
+/.cvsignore/1.10.18.1/Fri Jul 16 16:11:33 2004//Tocaml3083
+/.depend/1.47.6.1/Fri Jul  9 15:55:51 2004//Tocaml3083
+/Makefile/1.48.4.2/Fri Aug 20 15:11:36 2004//Tocaml3083
+/Makefile.nt/1.36.4.1/Fri Aug 20 15:11:36 2004//Tocaml3083
+/alloc.c/1.28/Thu Jan  1 16:42:34 2004//Tocaml3083
+/alloc.h/1.17/Fri Jan  2 19:23:18 2004//Tocaml3083
+/array.c/1.22/Fri Jan  2 19:23:19 2004//Tocaml3083
+/backtrace.c/1.20/Fri Jan  2 19:23:19 2004//Tocaml3083
+/backtrace.h/1.6/Wed Dec 31 14:20:35 2003//Tocaml3083
+/callback.c/1.22/Mon Apr 26 12:02:07 2004//Tocaml3083
+/callback.h/1.13/Mon Jan  5 20:25:58 2004//Tocaml3083
+/compact.c/1.22.6.1/Wed Mar  9 15:49:09 2005//Tocaml3083
+/compact.h/1.7/Wed Dec 31 14:20:35 2003//Tocaml3083
+/compare.c/1.31.6.1/Wed Jul  7 16:48:46 2004//Tocaml3083
+/compatibility.h/1.13/Mon Jun 14 14:28:30 2004//Tocaml3083
+/config.h/1.36/Mon Apr 19 07:55:28 2004//Tocaml3083
+/custom.c/1.14/Mon Jan  5 20:25:58 2004//Tocaml3083
+/custom.h/1.11.6.1/Tue Feb 22 14:33:36 2005//Tocaml3083
+/debugger.c/1.28/Fri Jan  2 19:23:20 2004//Tocaml3083
+/debugger.h/1.9/Thu Jan  1 16:42:35 2004//Tocaml3083
+/dynlink.c/1.14/Sun Feb 22 15:07:51 2004//Tocaml3083
+/dynlink.h/1.8/Sun Feb 22 15:07:51 2004//Tocaml3083
+/exec.h/1.14/Tue Jun  1 12:36:34 2004//Tocaml3083
+/extern.c/1.56/Sat Jun 19 16:02:07 2004//Tocaml3083
+/fail.c/1.29/Mon May 17 17:09:59 2004//Tocaml3083
+/fail.h/1.25/Fri Jan  2 19:23:20 2004//Tocaml3083
+/finalise.c/1.15.2.2/Wed Mar  9 15:49:09 2005//Tocaml3083
+/finalise.h/1.5/Fri Jan  2 19:23:21 2004//Tocaml3083
+/fix_code.c/1.31/Wed May 26 11:10:51 2004//Tocaml3083
+/fix_code.h/1.17/Fri Jan  2 19:23:21 2004//Tocaml3083
+/floats.c/1.46/Fri Jan  9 15:33:31 2004//Tocaml3083
+/freelist.c/1.16/Fri Jan  2 19:23:21 2004//Tocaml3083
+/freelist.h/1.12/Fri Jan  2 19:23:21 2004//Tocaml3083
+/gc.h/1.14/Mon Dec 15 18:10:46 2003//Tocaml3083
+/gc_ctrl.c/1.47.4.2/Wed Mar  9 15:49:09 2005//Tocaml3083
+/gc_ctrl.h/1.15/Fri Jan  2 19:23:22 2004//Tocaml3083
+/globroots.c/1.7/Mon Jan  5 20:25:58 2004//Tocaml3083
+/globroots.h/1.3/Mon Dec 15 18:10:47 2003//Tocaml3083
+/hash.c/1.22/Fri Jan  2 19:23:22 2004//Tocaml3083
+/instrtrace.c/1.19/Fri Apr 23 23:16:15 2004//Tocaml3083
+/instrtrace.h/1.8/Thu Apr 22 09:48:04 2004//Tocaml3083
+/instruct.h/1.20/Wed May 26 11:10:51 2004//Tocaml3083
+/int64_emul.h/1.3/Mon Dec 15 18:10:47 2003//Tocaml3083
+/int64_format.h/1.2/Mon Dec 15 18:10:47 2003//Tocaml3083
+/int64_native.h/1.4/Mon Dec 15 18:10:47 2003//Tocaml3083
+/intern.c/1.58.2.1/Wed Nov  3 19:47:20 2004//Tocaml3083
+/interp.c/1.90/Sat Jun 12 10:40:52 2004//Tocaml3083
+/interp.h/1.13/Mon Apr 26 14:08:22 2004//Tocaml3083
+/intext.h/1.30/Fri Jan  2 19:23:23 2004//Tocaml3083
+/ints.c/1.47/Fri Jan  2 19:23:23 2004//Tocaml3083
+/io.c/1.68/Thu Jan  8 22:28:48 2004//Tocaml3083
+/io.h/1.25/Thu Jan  1 16:42:36 2004//Tocaml3083
+/lexing.c/1.27/Thu Jan  1 16:42:36 2004//Tocaml3083
+/main.c/1.36/Thu Jan  8 22:28:48 2004//Tocaml3083
+/major_gc.c/1.54.2.1/Sat Jul  3 10:00:59 2004//Tocaml3083
+/major_gc.h/1.20/Mon Jun 14 15:17:43 2004//Tocaml3083
+/md5.c/1.18/Thu Jan  1 16:42:36 2004//Tocaml3083
+/md5.h/1.12/Wed Dec 31 14:20:37 2003//Tocaml3083
+/memory.c/1.40.2.1/Wed Dec 22 16:12:16 2004//Tocaml3083
+/memory.h/1.50.2.2/Mon Nov 22 11:16:03 2004//Tocaml3083
+/meta.c/1.31/Mon Apr 26 14:09:01 2004//Tocaml3083
+/minor_gc.c/1.42/Mon Jan  5 20:25:59 2004//Tocaml3083
+/minor_gc.h/1.17/Wed Dec 31 14:20:37 2003//Tocaml3083
+/misc.c/1.26/Thu Apr  1 13:07:57 2004//Tocaml3083
+/misc.h/1.30/Mon May 17 17:09:59 2004//Tocaml3083
+/mlvalues.h/1.48.6.1/Wed Jul  7 01:14:43 2004//Tocaml3083
+/obj.c/1.34.2.3/Tue Jan  4 16:29:27 2005//Tocaml3083
+/osdeps.h/1.9/Fri Jan  2 19:23:25 2004//Tocaml3083
+/parsing.c/1.20/Mon May 17 17:09:59 2004//Tocaml3083
+/prims.h/1.10/Sun Feb 22 15:07:51 2004//Tocaml3083
+/printexc.c/1.16/Thu Jan  8 22:28:48 2004//Tocaml3083
+/printexc.h/1.5/Thu Jan  1 16:42:37 2004//Tocaml3083
+/reverse.h/1.12/Mon Dec 15 18:10:48 2003//Tocaml3083
+/roots.c/1.28/Mon Jan  5 20:25:59 2004//Tocaml3083
+/roots.h/1.18/Thu Jan  1 16:42:37 2004//Tocaml3083
+/signals.c/1.46/Thu Jan  8 22:28:48 2004//Tocaml3083
+/signals.h/1.21/Thu Jan  1 16:42:37 2004//Tocaml3083
+/stacks.c/1.21/Thu Jan  1 16:42:37 2004//Tocaml3083
+/stacks.h/1.13/Thu Jan  1 16:42:37 2004//Tocaml3083
+/startup.c/1.64.4.1/Sat Jul  3 10:01:00 2004//Tocaml3083
+/startup.h/1.5/Sun Feb 22 15:07:51 2004//Tocaml3083
+/str.c/1.26/Mon May 17 17:09:59 2004//Tocaml3083
+/sys.c/1.76/Tue May 18 08:50:22 2004//Tocaml3083
+/sys.h/1.15/Tue Dec 16 18:09:43 2003//Tocaml3083
+/terminfo.c/1.23/Thu Jan  1 16:42:38 2004//Tocaml3083
+/ui.h/1.5/Mon Dec 15 18:10:49 2003//Tocaml3083
+/unix.c/1.21.6.1/Wed Aug 18 05:01:22 2004//Tocaml3083
+/weak.c/1.24/Thu Jan  1 16:42:38 2004//Tocaml3083
+/weak.h/1.7/Thu Jan  1 16:42:38 2004//Tocaml3083
+/win32.c/1.23.6.1/Mon Nov  8 13:08:00 2004//Tocaml3083
+D

diff --git a/byterun/CVS/Repository b/byterun/CVS/Repository
new file mode 100644 (file)
index 0000000..80cad38
--- /dev/null
+++ b/byterun/CVS/Repository
@@ -0,0 +1 @@
+csl/byterun

diff --git a/byterun/CVS/Root b/byterun/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/byterun/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/byterun/CVS/Tag b/byterun/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/byterun/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/byterun/compact.c b/byterun/compact.c
index fc94ba2022d4976b3844df83f11fdfbeed725aa0..f2dcbb82893d0833d76a11fcb4b220ec363e4c3e 100644 (file)
--- a/byterun/compact.c
+++ b/byterun/compact.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: compact.c,v 1.22 2004/01/02 19:23:19 doligez Exp $ */
+/* $Id: compact.c,v 1.22.6.1 2005/03/09 15:49:09 doligez Exp $ */
 
 #include <string.h>
 
@@ -408,7 +408,7 @@ void caml_compact_heap_maybe (void)
   float fw, fp;
                                           Assert (caml_gc_phase == Phase_idle);
   if (caml_percent_max >= 1000000) return;
-  if (caml_stat_major_collections < 5 || caml_stat_heap_chunks < 5) return;
+  if (caml_stat_major_collections < 5 || caml_stat_heap_chunks < 2) return;
 
   fw = 3.0 * caml_fl_cur_size - 2.0 * caml_fl_size_at_phase_change;
   if (fw < 0) fw = caml_fl_cur_size;

diff --git a/byterun/compare.h b/byterun/compare.h
deleted file mode 100644 (file)
index 5f29b1f..0000000
--- a/byterun/compare.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/***********************************************************************/
-/*                                                                     */
-/*                           Objective Caml                            */
-/*                                                                     */
-/*          Damien Doligez, Projet Moscova, INRIA Rocquencourt         */
-/*                                                                     */
-/*  Copyright 2003 Institut National de Recherche en Informatique et   */
-/*  en Automatique.  All rights reserved.  This file is distributed    */
-/*  under the terms of the GNU Library General Public License, with    */
-/*  the special exception on linking described in file ../LICENSE.     */
-/*                                                                     */
-/***********************************************************************/
-
-/* $Id: compare.h,v 1.2 2003/12/31 14:20:35 doligez Exp $ */
-
-#ifndef CAML_COMPARE_H
-#define CAML_COMPARE_H
-
-CAMLextern int caml_compare_unordered;
-
-#endif /* CAML_COMPARE_H */

diff --git a/byterun/custom.h b/byterun/custom.h
index 7240b0a02b5f17c529d3e5a977e770ed913b3bf4..6a0423244a961115eced949c65e9ac9bfb7d867a 100644 (file)
--- a/byterun/custom.h
+++ b/byterun/custom.h
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: custom.h,v 1.11 2004/01/01 16:42:35 doligez Exp $ */
+/* $Id: custom.h,v 1.11.6.1 2005/02/22 14:33:36 doligez Exp $ */
 
 #ifndef CAML_CUSTOM_H
 #define CAML_CUSTOM_H
@@ -48,6 +48,9 @@ CAMLextern value caml_alloc_custom(struct custom_operations * ops,
 
 CAMLextern void caml_register_custom_operations(struct custom_operations * ops);
 
+CAMLextern int caml_compare_unordered;
+  /* Used by custom comparison to report unordered NaN-like cases. */
+
 /* <private> */
 extern struct custom_operations * caml_find_custom_operations(char * ident);
 extern struct custom_operations *

diff --git a/byterun/finalise.c b/byterun/finalise.c
index cb1373d9aa0849eabc071ccd124f573e1bf67cfb..3c05e0a791df0e3d35e9fc7d31620dd062386852 100644 (file)
--- a/byterun/finalise.c
+++ b/byterun/finalise.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: finalise.c,v 1.15.2.1 2004/07/03 10:00:59 doligez Exp $ */
+/* $Id: finalise.c,v 1.15.2.2 2005/03/09 15:49:09 doligez Exp $ */
 
 /* Handling of finalised values. */
 
@@ -75,36 +75,39 @@ void caml_final_update (void)
     if (Is_white_val (final_table[i].val)) ++ todo_count;
   }
 
-  alloc_to_do (todo_count);
-  j = k = 0;
-  for (i = 0; i < old; i++){
-  again:
-    Assert (Is_block (final_table[i].val));
-    Assert (Is_in_heap (final_table[i].val));
-    if (Is_white_val (final_table[i].val)){
-      if (Tag_val (final_table[i].val) == Forward_tag){
-        value fv = Forward_val (final_table[i].val);
-        if (Is_block (fv) && (Is_young (fv) || Is_in_heap (fv))
-            && (Tag_val (fv) == Forward_tag || Tag_val (fv) == Lazy_tag
-                || Tag_val (fv) == Double_tag)){
-          /* Do not short-circuit the pointer. */
-        }else{
-          final_table[i].val = fv;
-          if (Is_block (final_table[i].val) && Is_in_heap (final_table[i].val)){
-            goto again;
+  if (todo_count > 0){
+    alloc_to_do (todo_count);
+    j = k = 0;
+    for (i = 0; i < old; i++){
+    again:
+      Assert (Is_block (final_table[i].val));
+      Assert (Is_in_heap (final_table[i].val));
+      if (Is_white_val (final_table[i].val)){
+        if (Tag_val (final_table[i].val) == Forward_tag){
+          value fv = Forward_val (final_table[i].val);
+          if (Is_block (fv) && (Is_young (fv) || Is_in_heap (fv))
+              && (Tag_val (fv) == Forward_tag || Tag_val (fv) == Lazy_tag
+                  || Tag_val (fv) == Double_tag)){
+            /* Do not short-circuit the pointer. */
+          }else{
+            final_table[i].val = fv;
+            if (Is_block (final_table[i].val)
+                && Is_in_heap (final_table[i].val)){
+              goto again;
+            }
           }
         }
+        to_do_tl->item[k++] = final_table[i];
+      }else{
+        final_table[j++] = final_table[i];
       }
-      to_do_tl->item[k++] = final_table[i];
-    }else{
-      final_table[j++] = final_table[i];
     }
-  }
-  old = young = j;
-  to_do_tl->size = k;
-  for (i = 0; i < k; i++){
-    CAMLassert (Is_white_val (to_do_tl->item[i].val));
-    caml_darken (to_do_tl->item[i].val, NULL);
+    young = old = j;
+    to_do_tl->size = k;
+    for (i = 0; i < k; i++){
+      CAMLassert (Is_white_val (to_do_tl->item[i].val));
+      caml_darken (to_do_tl->item[i].val, NULL);
+    }
   }
 }
 
@@ -123,7 +126,9 @@ void caml_final_do_calls (void)
     caml_gc_message (0x80, "Calling finalisation functions.\n", 0);
     while (1){
       while (to_do_hd != NULL && to_do_hd->size == 0){
-        to_do_hd = to_do_hd->next;
+        struct to_do *next_hd = to_do_hd->next;
+        free (to_do_hd);
+        to_do_hd = next_hd;
         if (to_do_hd == NULL) to_do_tl = NULL;
       }
       if (to_do_hd == NULL) break;
@@ -204,7 +209,6 @@ CAMLprim value caml_final_register (value f, value v)
   if (!(Is_block (v) && (Is_in_heap (v) || Is_young (v)))){
     caml_invalid_argument ("Gc.finalise");
   }
-
   Assert (old <= young);
   
   if (young >= size){

diff --git a/byterun/gc_ctrl.c b/byterun/gc_ctrl.c
index 7278786a57b1cfa9f9d72c709cd525ab12c09afd..97a489de234b492251ee30e717782f767080be6e 100644 (file)
--- a/byterun/gc_ctrl.c
+++ b/byterun/gc_ctrl.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: gc_ctrl.c,v 1.47 2004/04/15 15:00:27 doligez Exp $ */
+/* $Id: gc_ctrl.c,v 1.47.4.2 2005/03/09 15:49:09 doligez Exp $ */
 
 #include "alloc.h"
 #include "compact.h"
@@ -402,21 +402,40 @@ CAMLprim value caml_gc_minor(value v)
   return Val_unit;
 }
 
+static void test_and_compact (void)
+{
+  float fp;
+
+  fp = 100.0 * caml_fl_cur_size
+       / (Wsize_bsize (caml_stat_heap_size) - caml_fl_cur_size);
+  if (fp > 1000000.0) fp = 1000000.0;
+  caml_gc_message (0x200, "Estimated overhead (lower bound) = %lu%%\n",
+                   (unsigned long) fp);
+  if (fp >= caml_percent_max && caml_stat_heap_chunks > 1){
+    caml_gc_message (0x200, "Automatic compaction triggered.\n", 0);
+    caml_compact_heap ();
+  }
+}
+
 CAMLprim value caml_gc_major(value v)
 {                                                    Assert (v == Val_unit);
+  caml_gc_message (0x1, "Major GC cycle requested\n", 0);
   caml_empty_minor_heap ();
   caml_finish_major_cycle ();
+  test_and_compact ();
   caml_final_do_calls ();
   return Val_unit;
 }
 
 CAMLprim value caml_gc_full_major(value v)
 {                                                    Assert (v == Val_unit);
+  caml_gc_message (0x1, "Full major GC cycle requested\n", 0);
   caml_empty_minor_heap ();
   caml_finish_major_cycle ();
   caml_final_do_calls ();
   caml_empty_minor_heap ();
   caml_finish_major_cycle ();
+  test_and_compact ();
   caml_final_do_calls ();
   return Val_unit;
 }

diff --git a/byterun/memory.c b/byterun/memory.c
index 5a63976eeef2494e42cdb880713214750bbeb514..3ab5c3da26e0397064d5491d4c36f2be8e39ba0d 100644 (file)
--- a/byterun/memory.c
+++ b/byterun/memory.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: memory.c,v 1.40 2004/06/14 15:17:43 doligez Exp $ */
+/* $Id: memory.c,v 1.40.2.1 2004/12/22 16:12:16 doligez Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -88,6 +88,9 @@ int caml_add_to_heap (char *m)
   /* Should check the contents of the block. */
 #endif /* debug */
 
+  caml_gc_message (0x04, "Growing heap to %luk bytes\n",
+                   (caml_stat_heap_size + Chunk_size (m)) / 1024);
+
   /* Extend the page table as needed. */
   if (Page (m) < caml_page_low){
     page_table_entry *block, *new_page_table;
@@ -177,8 +180,6 @@ static char *expand_heap (mlsize_t request)
   asize_t malloc_request;
 
   malloc_request = caml_round_heap_chunk_size (Bhsize_wosize (request));
-  caml_gc_message (0x04, "Growing heap to %luk bytes\n",
-                   (caml_stat_heap_size + malloc_request) / 1024);
   mem = caml_alloc_for_heap (malloc_request);
   if (mem == NULL){
     caml_gc_message (0x04, "No room for growing heap\n", 0);

diff --git a/byterun/obj.c b/byterun/obj.c
index b1938aadddbaf901a4ac5e153855637316f18b5f..fbebb84bc66959186ee0684e20129e1718e48ff7 100644 (file)
--- a/byterun/obj.c
+++ b/byterun/obj.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: obj.c,v 1.34.2.1 2004/07/16 15:01:13 doligez Exp $ */
+/* $Id: obj.c,v 1.34.2.3 2005/01/04 16:29:27 doligez Exp $ */
 
 /* Operations on objects */
 
@@ -104,7 +104,7 @@ CAMLprim value caml_obj_dup(value arg)
   tag_t tg;
 
   sz = Wosize_val(arg);
-  if (sz == 0) return arg;
+  if (sz == 0) CAMLreturn (arg);
   tg = Tag_val(arg);
   if (tg >= No_scan_tag) {
     res = caml_alloc(sz, tg);
@@ -243,4 +243,4 @@ value caml_cache_public_method2 (value *meths, value tag, value *cache)
 }
 #endif /*CAML_JIT*/
 
-/* eof $Id: obj.c,v 1.34.2.1 2004/07/16 15:01:13 doligez Exp $ */
+/* eof $Id: obj.c,v 1.34.2.3 2005/01/04 16:29:27 doligez Exp $ */

diff --git a/camlp4/CVS/Entries b/camlp4/CVS/Entries
new file mode 100644 (file)
index 0000000..c569647
--- /dev/null
+++ b/camlp4/CVS/Entries
@@ -0,0 +1,4 @@
+/CHANGES/1.48.2.7/Mon Nov 22 16:25:38 2004//Tocaml3083
+/ICHANGES/1.3/Wed May 12 15:22:36 2004//Tocaml3083
+/Makefile/1.22.2.3/Wed Jul  7 16:41:58 2004//Tocaml3083
+D

diff --git a/camlp4/CVS/Entries.Log b/camlp4/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..dbf5e86
--- /dev/null
+++ b/camlp4/CVS/Entries.Log
@@ -0,0 +1,15 @@
+A D/boot////
+A D/camlp4////
+A D/compile////
+A D/config////
+A D/etc////
+A D/lib////
+A D/man////
+A D/meta////
+A D/ocaml_src////
+A D/ocaml_stuff////
+A D/ocpp////
+A D/odyl////
+A D/tools////
+A D/top////
+A D/unmaintained////

diff --git a/camlp4/CVS/Repository b/camlp4/CVS/Repository
new file mode 100644 (file)
index 0000000..af2ca2d
--- /dev/null
+++ b/camlp4/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4

diff --git a/camlp4/CVS/Root b/camlp4/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/CVS/Tag b/camlp4/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/boot/CVS/Entries b/camlp4/boot/CVS/Entries
new file mode 100644 (file)
index 0000000..bc35430
--- /dev/null
+++ b/camlp4/boot/CVS/Entries
@@ -0,0 +1,2 @@
+/.cvsignore/1.2/Fri Sep  7 08:09:27 2001//Tocaml3083
+D

diff --git a/camlp4/boot/CVS/Repository b/camlp4/boot/CVS/Repository
new file mode 100644 (file)
index 0000000..4698146
--- /dev/null
+++ b/camlp4/boot/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/boot

diff --git a/camlp4/boot/CVS/Root b/camlp4/boot/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/boot/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/boot/CVS/Tag b/camlp4/boot/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/boot/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/camlp4/.depend b/camlp4/camlp4/.depend
index 3c0f8e10bbf9c56f4e367278b738821cbd2ca579..2f078d8d33b32c15e268b9e8884068fddb7a8342 100644 (file)
--- a/camlp4/camlp4/.depend
+++ b/camlp4/camlp4/.depend
@@ -1,18 +1,18 @@
-ast2pt.cmi: $(OTOP)/parsing/location.cmi $(OTOP)/parsing/longident.cmi mLast.cmi \
-    $(OTOP)/parsing/parsetree.cmi 
-pcaml.cmi: mLast.cmi spretty.cmi 
+ast2pt.cmi: $(OTOP)/parsing/parsetree.cmi mLast.cmi $(OTOP)/parsing/longident.cmi \
+    $(OTOP)/parsing/location.cmi 
+pcaml.cmi: spretty.cmi mLast.cmi 
 quotation.cmi: mLast.cmi 
 reloc.cmi: mLast.cmi 
-argl.cmo: ast2pt.cmi mLast.cmi ../odyl/odyl_main.cmi pcaml.cmi 
-argl.cmx: ast2pt.cmx mLast.cmi ../odyl/odyl_main.cmx pcaml.cmx 
-ast2pt.cmo: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmi \
-    $(OTOP)/parsing/longident.cmi mLast.cmi $(OTOP)/parsing/parsetree.cmi \
-    pcaml.cmi ast2pt.cmi 
-ast2pt.cmx: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmx \
-    $(OTOP)/parsing/longident.cmx mLast.cmi $(OTOP)/parsing/parsetree.cmi \
-    pcaml.cmx ast2pt.cmi 
-pcaml.cmo: mLast.cmi quotation.cmi reloc.cmi spretty.cmi pcaml.cmi 
-pcaml.cmx: mLast.cmi quotation.cmx reloc.cmx spretty.cmx pcaml.cmi 
+argl.cmo: pcaml.cmi ../odyl/odyl_main.cmi mLast.cmi ast2pt.cmi 
+argl.cmx: pcaml.cmx ../odyl/odyl_main.cmx mLast.cmi ast2pt.cmx 
+ast2pt.cmo: pcaml.cmi $(OTOP)/parsing/parsetree.cmi mLast.cmi \
+    $(OTOP)/parsing/longident.cmi $(OTOP)/parsing/location.cmi \
+    $(OTOP)/parsing/asttypes.cmi ast2pt.cmi 
+ast2pt.cmx: pcaml.cmx $(OTOP)/parsing/parsetree.cmi mLast.cmi \
+    $(OTOP)/parsing/longident.cmx $(OTOP)/parsing/location.cmx \
+    $(OTOP)/parsing/asttypes.cmi ast2pt.cmi 
+pcaml.cmo: spretty.cmi reloc.cmi quotation.cmi mLast.cmi pcaml.cmi 
+pcaml.cmx: spretty.cmx reloc.cmx quotation.cmx mLast.cmi pcaml.cmi 
 quotation.cmo: mLast.cmi quotation.cmi 
 quotation.cmx: mLast.cmi quotation.cmi 
 reloc.cmo: mLast.cmi reloc.cmi 

diff --git a/camlp4/camlp4/CVS/Entries b/camlp4/camlp4/CVS/Entries
new file mode 100644 (file)
index 0000000..964f075
--- /dev/null
+++ b/camlp4/camlp4/CVS/Entries
@@ -0,0 +1,16 @@
+/.cvsignore/1.2/Thu Jul 10 12:28:14 2003//Tocaml3083
+/.depend/1.15.2.2/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.20.2.8/Mon Jan 31 10:38:53 2005//Tocaml3083
+/argl.ml/1.14.2.2/Thu Oct  7 09:18:13 2004//Tocaml3083
+/ast2pt.ml/1.31/Tue May 25 11:38:31 2004//Tocaml3083
+/ast2pt.mli/1.4/Wed May 12 15:22:38 2004//Tocaml3083
+/mLast.mli/1.17/Wed May 19 15:00:45 2004//Tocaml3083
+/pcaml.ml/1.13.2.4/Thu Oct  7 09:18:13 2004//Tocaml3083
+/pcaml.mli/1.7.2.4/Thu Oct  7 09:18:13 2004//Tocaml3083
+/quotation.ml/1.3/Fri Jul 19 14:53:44 2002//Tocaml3083
+/quotation.mli/1.2/Fri Jul 19 14:53:44 2002//Tocaml3083
+/reloc.ml/1.16/Wed May 19 15:00:45 2004//Tocaml3083
+/reloc.mli/1.3.2.2/Thu Jul  8 08:50:12 2004//Tocaml3083
+/spretty.ml/1.3/Tue Sep 23 18:06:18 2003//Tocaml3083
+/spretty.mli/1.2/Fri Jul 19 14:53:44 2002//Tocaml3083
+D

diff --git a/camlp4/camlp4/CVS/Repository b/camlp4/camlp4/CVS/Repository
new file mode 100644 (file)
index 0000000..1b6ed29
--- /dev/null
+++ b/camlp4/camlp4/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/camlp4

diff --git a/camlp4/camlp4/CVS/Root b/camlp4/camlp4/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/camlp4/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/camlp4/CVS/Tag b/camlp4/camlp4/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/camlp4/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/camlp4/Makefile b/camlp4/camlp4/Makefile
index 306bd5a7efbbd3689e9f3645a1c223e935d0aa62..f1d35f043c8d7008241fae9be5755df29cd74785 100644 (file)
--- a/camlp4/camlp4/Makefile
+++ b/camlp4/camlp4/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20.2.7 2004/07/28 13:43:16 mauny Exp $
+# $Id: Makefile,v 1.20.2.8 2005/01/31 10:38:53 mauny Exp $
 
 include ../config/Makefile
 
@@ -74,6 +74,12 @@ install:
        cp $(CAMLP4) "$(BINDIR)/."
        cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/."
        cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/."
+       cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
+       for f in argl.o argl.cmx; do \
+         if test -r $$f ; then \
+               cp $$f "$(LIBDIR)/camlp4/." ; \
+         fi ; \
+       done
        cp camlp4.cma $(LIBDIR)/camlp4/.
        for f in  camlp4.$(A)  camlp4.p.$(A) ; do \
          if test -f $$f ; then \

diff --git a/camlp4/compile/.depend b/camlp4/compile/.depend
index c2cf6345ea6e320f6374dbde26af7fd6416aa543..36ab100c5eb3e24dcf37a93d5ecee13c9b4400a0 100644 (file)
--- a/camlp4/compile/.depend
+++ b/camlp4/compile/.depend
@@ -1,6 +1,4 @@
 comp_trail.cmo: ../camlp4/pcaml.cmi 
 comp_trail.cmx: ../camlp4/pcaml.cmx 
-compile.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-compile.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_o_fast.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_o_fast.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
+compile.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+compile.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 

diff --git a/camlp4/compile/CVS/Entries b/camlp4/compile/CVS/Entries
new file mode 100644 (file)
index 0000000..d9499fc
--- /dev/null
+++ b/camlp4/compile/CVS/Entries
@@ -0,0 +1,8 @@
+/.cvsignore/1.1/Tue Nov  6 09:01:54 2001//Tocaml3083
+/.depend/1.6.4.4/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.8.4.2/Fri Feb 18 09:11:13 2005//Tocaml3083
+/comp_head.ml/1.3.6.1/Fri Feb 18 09:11:13 2005//Tocaml3083
+/comp_trail.ml/1.2/Thu Oct 30 09:52:54 2003//Tocaml3083
+/compile.ml/1.13/Wed May 12 15:22:39 2004//Tocaml3083
+/compile.sh/1.5/Fri Aug 29 12:15:14 2003//Tocaml3083
+D

diff --git a/camlp4/compile/CVS/Repository b/camlp4/compile/CVS/Repository
new file mode 100644 (file)
index 0000000..181b8d0
--- /dev/null
+++ b/camlp4/compile/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/compile

diff --git a/camlp4/compile/CVS/Root b/camlp4/compile/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/compile/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/compile/CVS/Tag b/camlp4/compile/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/compile/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/compile/Makefile b/camlp4/compile/Makefile
index 5b256e2a5a4a1544a5e52bff0ffca2838bfc6d50..bf2bcef6a3891efc65c2c373818c046fc3a80128 100644 (file)
--- a/camlp4/compile/Makefile
+++ b/camlp4/compile/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8.4.1 2004/06/23 11:54:57 mauny Exp $
+# $Id: Makefile,v 1.8.4.2 2005/02/18 09:11:13 mauny Exp $
 
 include ../config/Makefile
 
@@ -23,7 +23,7 @@ camlp4$D.fast.opt: pa_$D_fast.cmx
        cd ../camlp4; $(MAKE) optp4 CAMLP4OPT=../compile/camlp4$D.fast.opt CAMLP4M="../compile/pa_$D_fast.cmx ../meta/pr_dump.cmx"
 
 pa_$D_fast.ml: comp_head.ml $D_fast.ml comp_trail.ml
-       cat $(SRC) | sed -e "s/Plexer.gmake ()/P.lexer/" -e "/EXTEND/,/END/d" -e "/Grammar.Entry.of_parser/d" -e "/Grammar.Entry.gcreate/d" | cat comp_head.ml - $D_fast.ml comp_trail.ml > pa_$D_fast.ml
+       cat $(SRC) | sed -e "s/Plexer.make_lexer *()/P.lexer_pos/" -e "/EXTEND/,/END/d" -e "/Grammar.Entry.of_parser/d" -e "/Grammar.Entry.gcreate/d" | cat comp_head.ml - $D_fast.ml comp_trail.ml > pa_$D_fast.ml
 
 $D_fast.ml: compile.cmo $(SRC)
        OTOP=$(OTOP) EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) > $D_fast.ml

diff --git a/camlp4/compile/comp_head.ml b/camlp4/compile/comp_head.ml
index b3e6dad052b3a37e1c2a608e32c72926cce7d01f..72725cfca79a7ca224004bb186a561cb0f4273e1 100644 (file)
--- a/camlp4/compile/comp_head.ml
+++ b/camlp4/compile/comp_head.ml
@@ -1,5 +1,5 @@
 (* camlp4r q_MLast.cmo pa_extend.cmo *)
-(* $Id: comp_head.ml,v 1.3 2002/07/19 14:53:45 mauny Exp $ *)
+(* $Id: comp_head.ml,v 1.3.6.1 2005/02/18 09:11:13 mauny Exp $ *)
 
 module P =
   struct
@@ -62,7 +62,7 @@ let _ = do { Printf.eprintf "recovered or_zero at loc (%d, %d)\n" loc1 loc2; flu
       (if prev_symb = "" then "" else " after " ^ prev_symb) ^
       " (in [" ^ entry ^ "])"
     ;
-    value lexer = Plexer.gmake ();
+    value ((lexer,pos) as lexer_pos) = Plexer.make_lexer();
   end
 ;
 

diff --git a/camlp4/config/CVS/Entries b/camlp4/config/CVS/Entries
new file mode 100644 (file)
index 0000000..f998072
--- /dev/null
+++ b/camlp4/config/CVS/Entries
@@ -0,0 +1,6 @@
+/.cvsignore/1.1/Fri Sep  7 07:14:11 2001//Tocaml3083
+/Makefile-nt.cnf/1.6/Thu Aug 28 18:34:47 2003//Tocaml3083
+/Makefile.tpl/1.4.10.6/Sat Jul  3 16:53:45 2004//Tocaml3083
+/config.mpw/1.1/Thu Dec 13 13:59:23 2001//Tocaml3083
+/configure_batch/1.5.4.3/Fri Jul 30 14:59:15 2004//Tocaml3083
+D

diff --git a/camlp4/config/CVS/Repository b/camlp4/config/CVS/Repository
new file mode 100644 (file)
index 0000000..4d1e746
--- /dev/null
+++ b/camlp4/config/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/config

diff --git a/camlp4/config/CVS/Root b/camlp4/config/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/config/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/config/CVS/Tag b/camlp4/config/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/config/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/etc/.depend b/camlp4/etc/.depend
index 482bb10cc83a24104d8767c672503009bb6d2f83..f7c1e45437e2e490b9fd2a2d24ae7665bb6968d4 100644 (file)
--- a/camlp4/etc/.depend
+++ b/camlp4/etc/.depend
@@ -1,45 +1,45 @@
 parserify.cmi: ../camlp4/mLast.cmi 
-pa_extfold.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_extfold.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_extfun.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_extfun.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_fstream.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_fstream.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_ifdef.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_ifdef.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_o.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_oop.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_oop.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_op.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_op.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_ru.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_ru.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
+pa_extfold.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_extfold.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_extfun.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_extfun.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_fstream.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_fstream.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_ifdef.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_ifdef.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_o.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_o.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_oop.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_oop.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_op.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_op.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_ru.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_ru.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
 parserify.cmo: ../camlp4/mLast.cmi parserify.cmi 
 parserify.cmx: ../camlp4/mLast.cmi parserify.cmi 
-pr_depend.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pr_depend.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pr_extend.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_extend.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
-pr_extfun.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_extfun.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
+pr_depend.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_depend.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_extend.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_extend.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_extfun.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_extfun.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
 pr_null.cmo: ../camlp4/pcaml.cmi 
 pr_null.cmx: ../camlp4/pcaml.cmx 
-pr_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_o.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
-pr_op.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_op.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
-pr_op_main.cmo: ../camlp4/mLast.cmi parserify.cmi ../camlp4/pcaml.cmi \
-    ../camlp4/spretty.cmi 
-pr_op_main.cmx: ../camlp4/mLast.cmi parserify.cmx ../camlp4/pcaml.cmx \
-    ../camlp4/spretty.cmx 
-pr_r.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_r.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
-pr_rp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi 
-pr_rp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx 
-pr_rp_main.cmo: ../camlp4/mLast.cmi parserify.cmi ../camlp4/pcaml.cmi \
-    ../camlp4/spretty.cmi 
-pr_rp_main.cmx: ../camlp4/mLast.cmi parserify.cmx ../camlp4/pcaml.cmx \
-    ../camlp4/spretty.cmx 
-q_phony.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/quotation.cmi 
-q_phony.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/quotation.cmx 
+pr_o.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_o.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_op.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_op.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_op_main.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi parserify.cmi \
+    ../camlp4/mLast.cmi 
+pr_op_main.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx parserify.cmx \
+    ../camlp4/mLast.cmi 
+pr_r.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_r.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_rp.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pr_rp.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_rp_main.cmo: ../camlp4/spretty.cmi ../camlp4/pcaml.cmi parserify.cmi \
+    ../camlp4/mLast.cmi 
+pr_rp_main.cmx: ../camlp4/spretty.cmx ../camlp4/pcaml.cmx parserify.cmx \
+    ../camlp4/mLast.cmi 
+q_phony.cmo: ../camlp4/quotation.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+q_phony.cmx: ../camlp4/quotation.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 

diff --git a/camlp4/etc/CVS/Entries b/camlp4/etc/CVS/Entries
new file mode 100644 (file)
index 0000000..defc39c
--- /dev/null
+++ b/camlp4/etc/CVS/Entries
@@ -0,0 +1,27 @@
+/.cvsignore/1.3/Thu Jul 10 12:28:16 2003//Tocaml3083
+/.depend/1.13.2.4/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.20.2.2/Wed Jul  7 16:22:23 2004//Tocaml3083
+/mkcamlp4.mpw.tpl/1.2/Thu Jul 10 12:28:18 2003//Tocaml3083
+/mkcamlp4.sh.tpl/1.7/Tue Sep 23 18:17:35 2003//Tocaml3083
+/pa_extfold.ml/1.1/Fri Jul 19 14:53:45 2002//Tocaml3083
+/pa_extfun.ml/1.2/Fri Jul 19 14:53:45 2002//Tocaml3083
+/pa_fstream.ml/1.3/Fri Jul 19 14:53:45 2002//Tocaml3083
+/pa_ifdef.ml/1.1.6.1/Mon Jul  5 09:48:42 2004//Tocaml3083
+/pa_o.ml/1.58.2.4/Mon Nov 29 14:16:46 2004//Tocaml3083
+/pa_oop.ml/1.4/Wed May 12 15:22:40 2004//Tocaml3083
+/pa_op.ml/1.6/Thu Jul 10 12:28:21 2003//Tocaml3083
+/pa_ru.ml/1.7/Thu Jul 10 12:28:21 2003//Tocaml3083
+/parserify.ml/1.2/Wed May 12 15:22:40 2004//Tocaml3083
+/parserify.mli/1.1/Thu Jul 10 12:28:22 2003//Tocaml3083
+/pr_depend.ml/1.13/Wed Jul 23 22:26:17 2003//Tocaml3083
+/pr_extend.ml/1.13/Wed May 12 15:22:40 2004//Tocaml3083
+/pr_extfun.ml/1.3/Wed May 12 15:22:40 2004//Tocaml3083
+/pr_null.ml/1.2/Fri Jul 19 14:53:46 2002//Tocaml3083
+/pr_o.ml/1.45/Wed May 12 21:33:45 2004//Tocaml3083
+/pr_op.ml/1.4/Fri Jul 19 14:53:47 2002//Tocaml3083
+/pr_op_main.ml/1.2/Wed May 12 15:22:40 2004//Tocaml3083
+/pr_r.ml/1.48/Wed May 12 15:22:41 2004//Tocaml3083
+/pr_rp.ml/1.5/Wed May 12 15:22:41 2004//Tocaml3083
+/pr_rp_main.ml/1.2/Wed May 12 15:22:41 2004//Tocaml3083
+/q_phony.ml/1.4/Wed May 12 15:22:41 2004//Tocaml3083
+D

diff --git a/camlp4/etc/CVS/Repository b/camlp4/etc/CVS/Repository
new file mode 100644 (file)
index 0000000..1acdabf
--- /dev/null
+++ b/camlp4/etc/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/etc

diff --git a/camlp4/etc/CVS/Root b/camlp4/etc/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/etc/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/etc/CVS/Tag b/camlp4/etc/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/etc/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/etc/pa_o.ml b/camlp4/etc/pa_o.ml
index 62622c86aa6e643a2a7d7672c2aa4efaee5b64ef..b23a63fd619259ea27978f75e9eef148fef5e9d4 100644 (file)
--- a/camlp4/etc/pa_o.ml
+++ b/camlp4/etc/pa_o.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: pa_o.ml,v 1.58.2.3 2004/10/07 09:18:13 mauny Exp $ *)
+(* $Id: pa_o.ml,v 1.58.2.4 2004/11/29 14:16:46 mauny Exp $ *)
 
 open Stdpp;
 open Pcaml;
@@ -18,13 +18,12 @@ open Pcaml;
 Pcaml.syntax_name.val := "OCaml";
 Pcaml.no_constructors_arity.val := True;
 
-value (lexer, pos) =
-  Plexer.make_lexer ()
-;
 
 do {
   let odfa = Plexer.dollar_for_antiquotation.val in
   Plexer.dollar_for_antiquotation.val := False;
+  let (lexer, pos) = Plexer.make_lexer () in
+  Pcaml.position.val := pos;
   Grammar.Unsafe.gram_reinit gram lexer;
   Plexer.dollar_for_antiquotation.val := odfa;
   Grammar.Unsafe.clear_entry interf;
@@ -48,7 +47,6 @@ do {
 
 Pcaml.parse_interf.val := Grammar.Entry.parse interf;
 Pcaml.parse_implem.val := Grammar.Entry.parse implem;
-Pcaml.position.val := pos;
 
 value o2b =
   fun

diff --git a/camlp4/lib/.depend b/camlp4/lib/.depend
index d7afaebeb24a27bb4d7d2dbfcea5bd86b3a74bfe..286b4c5b02abcc55a8dda5003ed9634c2b60147e 100644 (file)
--- a/camlp4/lib/.depend
+++ b/camlp4/lib/.depend
@@ -1,20 +1,20 @@
 extfold.cmi: gramext.cmi 
 gramext.cmi: token.cmi 
-grammar.cmi: gramext.cmi token.cmi 
+grammar.cmi: token.cmi gramext.cmi 
 plexer.cmi: token.cmi 
 stdpp.cmi: token.cmi 
-extfold.cmo: gramext.cmi grammar.cmi extfold.cmi 
-extfold.cmx: gramext.cmx grammar.cmx extfold.cmi 
+extfold.cmo: grammar.cmi gramext.cmi extfold.cmi 
+extfold.cmx: grammar.cmx gramext.cmx extfold.cmi 
 extfun.cmo: extfun.cmi 
 extfun.cmx: extfun.cmi 
 fstream.cmo: fstream.cmi 
 fstream.cmx: fstream.cmi 
 gramext.cmo: token.cmi gramext.cmi 
 gramext.cmx: token.cmx gramext.cmi 
-grammar.cmo: gramext.cmi stdpp.cmi token.cmi grammar.cmi 
-grammar.cmx: gramext.cmx stdpp.cmx token.cmx grammar.cmi 
-plexer.cmo: stdpp.cmi token.cmi plexer.cmi 
-plexer.cmx: stdpp.cmx token.cmx plexer.cmi 
+grammar.cmo: token.cmi stdpp.cmi gramext.cmi grammar.cmi 
+grammar.cmx: token.cmx stdpp.cmx gramext.cmx grammar.cmi 
+plexer.cmo: token.cmi stdpp.cmi plexer.cmi 
+plexer.cmx: token.cmx stdpp.cmx plexer.cmi 
 stdpp.cmo: token.cmi stdpp.cmi 
 stdpp.cmx: token.cmx stdpp.cmi 
 token.cmo: token.cmi 

diff --git a/camlp4/lib/CVS/Entries b/camlp4/lib/CVS/Entries
new file mode 100644 (file)
index 0000000..bbcc681
--- /dev/null
+++ b/camlp4/lib/CVS/Entries
@@ -0,0 +1,20 @@
+/.cvsignore/1.1/Fri Sep  7 07:23:16 2001//Tocaml3083
+/.depend/1.3.2.1/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.8.2.6/Wed Jul 28 13:55:43 2004//Tocaml3083
+/extfold.ml/1.1/Fri Jul 19 14:53:47 2002//Tocaml3083
+/extfold.mli/1.1/Fri Jul 19 14:53:47 2002//Tocaml3083
+/extfun.ml/1.3/Thu Jul 10 12:28:24 2003//Tocaml3083
+/extfun.mli/1.2/Fri Jul 19 14:53:48 2002//Tocaml3083
+/fstream.ml/1.5/Thu Jul 10 12:28:24 2003//Tocaml3083
+/fstream.mli/1.3/Fri Jul 19 14:53:48 2002//Tocaml3083
+/gramext.ml/1.4/Fri Jul 19 14:53:48 2002//Tocaml3083
+/gramext.mli/1.3/Fri Jul 19 14:53:48 2002//Tocaml3083
+/grammar.ml/1.12.2.2/Mon Nov 22 13:41:24 2004//Tocaml3083
+/grammar.mli/1.6.2.1/Mon Nov 22 13:41:24 2004//Tocaml3083
+/plexer.ml/1.20.2.5/Fri Feb 18 09:11:13 2005//Tocaml3083
+/plexer.mli/1.7.4.1/Thu Oct  7 09:18:13 2004//Tocaml3083
+/stdpp.ml/1.5/Wed May 12 15:22:42 2004//Tocaml3083
+/stdpp.mli/1.5/Wed May 12 15:22:42 2004//Tocaml3083
+/token.ml/1.11.2.1/Mon Jun 28 18:30:48 2004//Tocaml3083
+/token.mli/1.6/Wed May 12 15:22:42 2004//Tocaml3083
+D

diff --git a/camlp4/lib/CVS/Repository b/camlp4/lib/CVS/Repository
new file mode 100644 (file)
index 0000000..c004ba3
--- /dev/null
+++ b/camlp4/lib/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/lib

diff --git a/camlp4/lib/CVS/Root b/camlp4/lib/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/lib/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/lib/CVS/Tag b/camlp4/lib/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/lib/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/lib/plexer.ml b/camlp4/lib/plexer.ml
index ffb9c7f605358ac88d5f070a28a08ce5ea91041a..30cf52cd5059fb816e4645106e633fca27205cee 100644 (file)
--- a/camlp4/lib/plexer.ml
+++ b/camlp4/lib/plexer.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: plexer.ml,v 1.20.2.4 2004/10/07 09:18:13 mauny Exp $ *)
+(* $Id: plexer.ml,v 1.20.2.5 2005/02/18 09:11:13 mauny Exp $ *)
 
 open Stdpp;
 open Token;
@@ -350,8 +350,10 @@ value next_token_fun dfa ssd find_kwd fname lnum bolpos glexr =
         do { bolpos.val := bol; incr lnum; char bp (store len '\013') s}
     | [: `c; s :] -> char bp (store len c) s
     | [: :] ep -> err (mkloc (bp, ep)) "char not terminated" ]
-  and dollar bp len =
-    parser
+  and dollar bp len s =
+    if no_quotations.val then
+      ("", get_buff (ident2 (store 0 '$') s)) 
+    else match s with parser
     [ [: `'$' :] -> ("ANTIQUOT", ":" ^ get_buff len)
     | [: `('a'..'z' | 'A'..'Z' as c); s :] -> antiquot bp (store len c) s
     | [: `('0'..'9' as c); s :] -> maybe_locate bp (store len c) s

diff --git a/camlp4/man/CVS/Entries b/camlp4/man/CVS/Entries
new file mode 100644 (file)
index 0000000..1e20a15
--- /dev/null
+++ b/camlp4/man/CVS/Entries
@@ -0,0 +1,5 @@
+/.cvsignore/1.2/Thu Dec 13 13:59:23 2001//Tocaml3083
+/Makefile/1.6/Thu Jul  3 16:14:49 2003//Tocaml3083
+/camlp4.1.tpl/1.7.4.1/Mon Aug  2 08:04:35 2004//Tocaml3083
+/camlp4.help.tpl/1.1/Thu Dec 13 13:59:23 2001//Tocaml3083
+D

diff --git a/camlp4/man/CVS/Repository b/camlp4/man/CVS/Repository
new file mode 100644 (file)
index 0000000..501e95d
--- /dev/null
+++ b/camlp4/man/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/man

diff --git a/camlp4/man/CVS/Root b/camlp4/man/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/man/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/man/CVS/Tag b/camlp4/man/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/man/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/meta/.depend b/camlp4/meta/.depend
index 977947f59fadd63668597b896a62bb8cc2a03ceb..83b86c2708eff14ce5582f516f9a337d69c3d300 100644 (file)
--- a/camlp4/meta/.depend
+++ b/camlp4/meta/.depend
@@ -1,16 +1,16 @@
-pa_extend.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/reloc.cmi 
-pa_extend.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/reloc.cmx 
+pa_extend.cmo: ../camlp4/reloc.cmi ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_extend.cmx: ../camlp4/reloc.cmx ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
 pa_extend_m.cmo: pa_extend.cmo 
 pa_extend_m.cmx: pa_extend.cmx 
-pa_macro.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_macro.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_r.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_r.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pa_rp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi 
-pa_rp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx 
-pr_dump.cmo: ../camlp4/ast2pt.cmi $(OTOP)/utils/config.cmi ../camlp4/pcaml.cmi 
-pr_dump.cmx: ../camlp4/ast2pt.cmx $(OTOP)/utils/config.cmx ../camlp4/pcaml.cmx 
-q_MLast.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/quotation.cmi \
-    ../camlp4/reloc.cmi 
-q_MLast.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/quotation.cmx \
-    ../camlp4/reloc.cmx 
+pa_macro.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_macro.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_r.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_r.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pa_rp.cmo: ../camlp4/pcaml.cmi ../camlp4/mLast.cmi 
+pa_rp.cmx: ../camlp4/pcaml.cmx ../camlp4/mLast.cmi 
+pr_dump.cmo: ../camlp4/pcaml.cmi $(OTOP)/utils/config.cmi ../camlp4/ast2pt.cmi 
+pr_dump.cmx: ../camlp4/pcaml.cmx $(OTOP)/utils/config.cmx ../camlp4/ast2pt.cmx 
+q_MLast.cmo: ../camlp4/reloc.cmi ../camlp4/quotation.cmi ../camlp4/pcaml.cmi \
+    ../camlp4/mLast.cmi 
+q_MLast.cmx: ../camlp4/reloc.cmx ../camlp4/quotation.cmx ../camlp4/pcaml.cmx \
+    ../camlp4/mLast.cmi 

diff --git a/camlp4/meta/CVS/Entries b/camlp4/meta/CVS/Entries
new file mode 100644 (file)
index 0000000..efecb20
--- /dev/null
+++ b/camlp4/meta/CVS/Entries
@@ -0,0 +1,11 @@
+/.cvsignore/1.1/Fri Sep  7 07:51:49 2001//Tocaml3083
+/.depend/1.7.2.2/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.15.2.1/Mon Jul 12 10:05:21 2004//Tocaml3083
+/pa_extend.ml/1.33/Wed May 12 15:22:43 2004//Tocaml3083
+/pa_extend_m.ml/1.8/Fri Jul 19 14:53:50 2002//Tocaml3083
+/pa_macro.ml/1.2.4.6/Fri Jul  2 09:37:16 2004//Tocaml3083
+/pa_r.ml/1.59.2.2/Mon Nov 29 14:16:46 2004//Tocaml3083
+/pa_rp.ml/1.7/Thu Jul 10 12:28:27 2003//Tocaml3083
+/pr_dump.ml/1.4/Thu Jul 10 12:28:27 2003//Tocaml3083
+/q_MLast.ml/1.56/Tue May 25 18:53:18 2004//Tocaml3083
+D

diff --git a/camlp4/meta/CVS/Repository b/camlp4/meta/CVS/Repository
new file mode 100644 (file)
index 0000000..d93ef78
--- /dev/null
+++ b/camlp4/meta/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/meta

diff --git a/camlp4/meta/CVS/Root b/camlp4/meta/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/meta/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/meta/CVS/Tag b/camlp4/meta/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/meta/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/meta/pa_r.ml b/camlp4/meta/pa_r.ml
index 90498d81bd90b080896dd4c9078f7b22a3b77ccf..05655e3841abd2adf53854f4e4f6bfd7e1690ae1 100644 (file)
--- a/camlp4/meta/pa_r.ml
+++ b/camlp4/meta/pa_r.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: pa_r.ml,v 1.59.2.1 2004/10/07 09:18:13 mauny Exp $ *)
+(* $Id: pa_r.ml,v 1.59.2.2 2004/11/29 14:16:46 mauny Exp $ *)
 
 open Stdpp;
 open Pcaml;
@@ -37,13 +37,11 @@ To avoid compilation warning use the new syntax.
 Pcaml.add_option "-help_seq" (Arg.Unit help_sequences)
   "Print explanations about new sequences and exit.";
 
-value (lexer, pos) =
-  Plexer.make_lexer ()
-;
-
 do {
   let odfa = Plexer.dollar_for_antiquotation.val in
   Plexer.dollar_for_antiquotation.val := False;
+  let (lexer, pos) = Plexer.make_lexer () in
+  Pcaml.position.val := pos;
   Grammar.Unsafe.gram_reinit gram lexer;
   Plexer.dollar_for_antiquotation.val := odfa;
   Grammar.Unsafe.clear_entry interf;
@@ -67,7 +65,6 @@ do {
 
 Pcaml.parse_interf.val := Grammar.Entry.parse interf;
 Pcaml.parse_implem.val := Grammar.Entry.parse implem;
-Pcaml.position.val := pos;
 
 value o2b =
   fun

diff --git a/camlp4/ocaml_src/CVS/Entries b/camlp4/ocaml_src/CVS/Entries
new file mode 100644 (file)
index 0000000..39b66de
--- /dev/null
+++ b/camlp4/ocaml_src/CVS/Entries
@@ -0,0 +1,2 @@
+/.cvsignore/1.1/Fri Sep  7 11:19:48 2001//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/CVS/Entries.Log b/camlp4/ocaml_src/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..5f8c2dd
--- /dev/null
+++ b/camlp4/ocaml_src/CVS/Entries.Log
@@ -0,0 +1,5 @@
+A D/camlp4////
+A D/lib////
+A D/meta////
+A D/odyl////
+A D/tools////

diff --git a/camlp4/ocaml_src/CVS/Repository b/camlp4/ocaml_src/CVS/Repository
new file mode 100644 (file)
index 0000000..b0b043d
--- /dev/null
+++ b/camlp4/ocaml_src/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src

diff --git a/camlp4/ocaml_src/CVS/Root b/camlp4/ocaml_src/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/CVS/Tag b/camlp4/ocaml_src/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_src/camlp4/CVS/Entries b/camlp4/ocaml_src/camlp4/CVS/Entries
new file mode 100644 (file)
index 0000000..1a3f743
--- /dev/null
+++ b/camlp4/ocaml_src/camlp4/CVS/Entries
@@ -0,0 +1,16 @@
+/.cvsignore/1.2/Fri Sep  7 07:39:39 2001//Tocaml3083
+/.depend/1.13.2.1/Wed Jun 30 16:23:18 2004//Tocaml3083
+/Makefile/1.20.2.5/Fri Feb 18 09:11:13 2005//Tocaml3083
+/argl.ml/1.17.2.3/Thu Oct  7 09:18:13 2004//Tocaml3083
+/ast2pt.ml/1.30.2.2/Mon Nov 22 13:41:25 2004//Tocaml3083
+/ast2pt.mli/1.3/Wed May 12 15:22:44 2004//Tocaml3083
+/mLast.mli/1.19/Wed May 19 15:00:46 2004//Tocaml3083
+/pcaml.ml/1.18.2.4/Thu Oct  7 09:18:13 2004//Tocaml3083
+/pcaml.mli/1.8.2.4/Thu Oct  7 09:18:13 2004//Tocaml3083
+/quotation.ml/1.3/Sat Feb 16 18:44:18 2002//Tocaml3083
+/quotation.mli/1.3/Fri Jul 19 14:53:51 2002//Tocaml3083
+/reloc.ml/1.18/Wed May 19 15:00:47 2004//Tocaml3083
+/reloc.mli/1.3.2.3/Mon Jul 12 22:33:52 2004//Tocaml3083
+/spretty.ml/1.5/Thu Sep 25 12:05:06 2003//Tocaml3083
+/spretty.mli/1.3/Fri Jul 19 14:53:51 2002//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/camlp4/CVS/Repository b/camlp4/ocaml_src/camlp4/CVS/Repository
new file mode 100644 (file)
index 0000000..0142181
--- /dev/null
+++ b/camlp4/ocaml_src/camlp4/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src/camlp4

diff --git a/camlp4/ocaml_src/camlp4/CVS/Root b/camlp4/ocaml_src/camlp4/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/camlp4/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/camlp4/CVS/Tag b/camlp4/ocaml_src/camlp4/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/camlp4/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_src/camlp4/Makefile b/camlp4/ocaml_src/camlp4/Makefile
index d77606597e9c35e633479786cf46709dc4132b1b..81227d3b1ed2e57414451d771debc99fb12fde62 100644 (file)
--- a/camlp4/ocaml_src/camlp4/Makefile
+++ b/camlp4/ocaml_src/camlp4/Makefile
@@ -74,6 +74,12 @@ install:
        cp $(CAMLP4) "$(BINDIR)/."
        cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/."
        cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/."
+       cp  argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
+       for f in argl.o argl.cmx; do \
+         if test -r $$f ; then \
+               cp $$f "$(LIBDIR)/camlp4/." ; \
+         fi ; \
+       done
        cp camlp4.cma $(LIBDIR)/camlp4/.
        for f in  camlp4.$(A)  camlp4.p.$(A) ; do \
          if test -f $$f ; then \

diff --git a/camlp4/ocaml_src/lib/CVS/Entries b/camlp4/ocaml_src/lib/CVS/Entries
new file mode 100644 (file)
index 0000000..cd7bae8
--- /dev/null
+++ b/camlp4/ocaml_src/lib/CVS/Entries
@@ -0,0 +1,19 @@
+/.depend/1.3/Wed May 12 15:22:45 2004//Tocaml3083
+/Makefile/1.11.2.5/Mon Nov 22 13:41:25 2004//Tocaml3083
+/extfold.ml/1.1/Fri Jul 19 14:53:52 2002//Tocaml3083
+/extfold.mli/1.1/Fri Jul 19 14:53:52 2002//Tocaml3083
+/extfun.ml/1.2/Fri Dec 14 19:39:32 2001//Tocaml3083
+/extfun.mli/1.3/Fri Jul 19 14:53:52 2002//Tocaml3083
+/fstream.ml/1.5/Fri Jul 19 14:53:52 2002//Tocaml3083
+/fstream.mli/1.3/Wed Jan 23 16:27:56 2002//Tocaml3083
+/gramext.ml/1.5/Fri Jul 19 14:53:52 2002//Tocaml3083
+/gramext.mli/1.4/Fri Jul 19 14:53:52 2002//Tocaml3083
+/grammar.ml/1.12.2.2/Mon Nov 22 13:41:25 2004//Tocaml3083
+/grammar.mli/1.8.2.1/Mon Nov 22 13:41:25 2004//Tocaml3083
+/plexer.ml/1.22.2.6/Fri Feb 18 09:11:13 2005//Tocaml3083
+/plexer.mli/1.9.4.2/Mon Nov 22 13:41:25 2004//Tocaml3083
+/stdpp.ml/1.5/Wed May 12 15:22:46 2004//Tocaml3083
+/stdpp.mli/1.6/Wed May 12 15:22:46 2004//Tocaml3083
+/token.ml/1.13.2.1/Mon Jun 28 18:30:48 2004//Tocaml3083
+/token.mli/1.7/Wed May 12 15:22:46 2004//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/lib/CVS/Repository b/camlp4/ocaml_src/lib/CVS/Repository
new file mode 100644 (file)
index 0000000..8a097f7
--- /dev/null
+++ b/camlp4/ocaml_src/lib/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src/lib

diff --git a/camlp4/ocaml_src/lib/CVS/Root b/camlp4/ocaml_src/lib/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/lib/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/lib/CVS/Tag b/camlp4/ocaml_src/lib/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/lib/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_src/lib/plexer.ml b/camlp4/ocaml_src/lib/plexer.ml
index 57fe1a6820ba18f2b8ec2c62ecb30641e0dadca9..6f5aab2dbd6535c360e6c0bea25a9a4301bad924 100644 (file)
--- a/camlp4/ocaml_src/lib/plexer.ml
+++ b/camlp4/ocaml_src/lib/plexer.ml
@@ -506,37 +506,41 @@ let next_token_fun dfa ssd find_kwd fname lnum bolpos glexr =
     | _ ->
         let ep = Stream.count strm__ in
         err (mkloc (bp, ep)) "char not terminated"
-  and dollar bp len (strm__ : _ Stream.t) =
-    match Stream.peek strm__ with
-      Some '$' -> Stream.junk strm__; "ANTIQUOT", ":" ^ get_buff len
-    | Some ('a'..'z' | 'A'..'Z' as c) ->
-        Stream.junk strm__; antiquot bp (store len c) strm__
-    | Some ('0'..'9' as c) ->
-        Stream.junk strm__; maybe_locate bp (store len c) strm__
-    | Some ':' ->
-        Stream.junk strm__;
-        let k = get_buff len in
-        "ANTIQUOT", k ^ ":" ^ locate_or_antiquot_rest bp 0 strm__
-    | Some '\\' ->
-        Stream.junk strm__;
-        begin match Stream.peek strm__ with
-          Some c ->
-            Stream.junk strm__;
-            "ANTIQUOT", ":" ^ locate_or_antiquot_rest bp (store len c) strm__
-        | _ -> raise (Stream.Error "")
-        end
-    | _ ->
-        let s = strm__ in
-        if dfa then
-          let (strm__ : _ Stream.t) = s in
-          match Stream.peek strm__ with
+  and dollar bp len s =
+    if !no_quotations then "", get_buff (ident2 (store 0 '$') s)
+    else
+      let (strm__ : _ Stream.t) = s in
+      match Stream.peek strm__ with
+        Some '$' -> Stream.junk strm__; "ANTIQUOT", ":" ^ get_buff len
+      | Some ('a'..'z' | 'A'..'Z' as c) ->
+          Stream.junk strm__; antiquot bp (store len c) strm__
+      | Some ('0'..'9' as c) ->
+          Stream.junk strm__; maybe_locate bp (store len c) strm__
+      | Some ':' ->
+          Stream.junk strm__;
+          let k = get_buff len in
+          "ANTIQUOT", k ^ ":" ^ locate_or_antiquot_rest bp 0 strm__
+      | Some '\\' ->
+          Stream.junk strm__;
+          begin match Stream.peek strm__ with
             Some c ->
               Stream.junk strm__;
-              "ANTIQUOT", ":" ^ locate_or_antiquot_rest bp (store len c) s
-          | _ ->
-              let ep = Stream.count strm__ in
-              err (mkloc (bp, ep)) "antiquotation not terminated"
-        else "", get_buff (ident2 (store 0 '$') s)
+              "ANTIQUOT",
+              ":" ^ locate_or_antiquot_rest bp (store len c) strm__
+          | _ -> raise (Stream.Error "")
+          end
+      | _ ->
+          let s = strm__ in
+          if dfa then
+            let (strm__ : _ Stream.t) = s in
+            match Stream.peek strm__ with
+              Some c ->
+                Stream.junk strm__;
+                "ANTIQUOT", ":" ^ locate_or_antiquot_rest bp (store len c) s
+            | _ ->
+                let ep = Stream.count strm__ in
+                err (mkloc (bp, ep)) "antiquotation not terminated"
+          else "", get_buff (ident2 (store 0 '$') s)
   and maybe_locate bp len (strm__ : _ Stream.t) =
     match Stream.peek strm__ with
       Some '$' -> Stream.junk strm__; "ANTIQUOT", ":" ^ get_buff len
@@ -1069,11 +1073,11 @@ let make_lexer () =
   let id_table = Hashtbl.create 301 in
   let glexr =
     ref
-      {tok_func = (fun _ -> raise (Match_failure ("", 760, 17)));
-       tok_using = (fun _ -> raise (Match_failure ("", 760, 37)));
-       tok_removing = (fun _ -> raise (Match_failure ("", 760, 60)));
-       tok_match = (fun _ -> raise (Match_failure ("", 761, 18)));
-       tok_text = (fun _ -> raise (Match_failure ("", 761, 37)));
+      {tok_func = (fun _ -> raise (Match_failure ("", 762, 17)));
+       tok_using = (fun _ -> raise (Match_failure ("", 762, 37)));
+       tok_removing = (fun _ -> raise (Match_failure ("", 762, 60)));
+       tok_match = (fun _ -> raise (Match_failure ("", 763, 18)));
+       tok_text = (fun _ -> raise (Match_failure ("", 763, 37)));
        tok_comm = None}
   in
   let (f, pos) = func kwd_table glexr in
@@ -1105,11 +1109,11 @@ let make () =
   let id_table = Hashtbl.create 301 in
   let glexr =
     ref
-      {tok_func = (fun _ -> raise (Match_failure ("", 794, 17)));
-       tok_using = (fun _ -> raise (Match_failure ("", 794, 37)));
-       tok_removing = (fun _ -> raise (Match_failure ("", 794, 60)));
-       tok_match = (fun _ -> raise (Match_failure ("", 795, 18)));
-       tok_text = (fun _ -> raise (Match_failure ("", 795, 37)));
+      {tok_func = (fun _ -> raise (Match_failure ("", 796, 17)));
+       tok_using = (fun _ -> raise (Match_failure ("", 796, 37)));
+       tok_removing = (fun _ -> raise (Match_failure ("", 796, 60)));
+       tok_match = (fun _ -> raise (Match_failure ("", 797, 18)));
+       tok_text = (fun _ -> raise (Match_failure ("", 797, 37)));
        tok_comm = None}
   in
   {func = fst (func kwd_table glexr); using = using_token kwd_table id_table;

diff --git a/camlp4/ocaml_src/meta/CVS/Entries b/camlp4/ocaml_src/meta/CVS/Entries
new file mode 100644 (file)
index 0000000..50ffebe
--- /dev/null
+++ b/camlp4/ocaml_src/meta/CVS/Entries
@@ -0,0 +1,11 @@
+/.cvsignore/1.1/Fri Sep  7 07:19:20 2001//Tocaml3083
+/.depend/1.7.2.1/Wed Jul  7 16:13:53 2004//Tocaml3083
+/Makefile/1.15.2.1/Wed Aug 18 11:17:37 2004//Tocaml3083
+/pa_extend.ml/1.32/Wed May 12 15:22:46 2004//Tocaml3083
+/pa_extend_m.ml/1.10/Wed May 12 15:22:46 2004//Tocaml3083
+/pa_macro.ml/1.2.4.5/Tue Jun 29 20:41:02 2004//Tocaml3083
+/pa_r.ml/1.54.2.4/Mon Nov 29 14:16:46 2004//Tocaml3083
+/pa_rp.ml/1.6/Wed May 12 15:22:47 2004//Tocaml3083
+/pr_dump.ml/1.4/Thu Jul 10 12:28:32 2003//Tocaml3083
+/q_MLast.ml/1.61/Tue May 25 18:53:19 2004//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/meta/CVS/Repository b/camlp4/ocaml_src/meta/CVS/Repository
new file mode 100644 (file)
index 0000000..64f3255
--- /dev/null
+++ b/camlp4/ocaml_src/meta/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src/meta

diff --git a/camlp4/ocaml_src/meta/CVS/Root b/camlp4/ocaml_src/meta/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/meta/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/meta/CVS/Tag b/camlp4/ocaml_src/meta/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/meta/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_src/meta/pa_r.ml b/camlp4/ocaml_src/meta/pa_r.ml
index 710d08bd596ba50d45705cc2c55629de535582d7..e052e9b45b30b3c2ffea75a25d7a041c838b2e02 100644 (file)
--- a/camlp4/ocaml_src/meta/pa_r.ml
+++ b/camlp4/ocaml_src/meta/pa_r.ml
@@ -35,10 +35,10 @@ To avoid compilation warning use the new syntax.
 Pcaml.add_option "-help_seq" (Arg.Unit help_sequences)
   "Print explanations about new sequences and exit.";;
 
-let (lexer, pos) = Plexer.make_lexer ();;
-
 let odfa = !(Plexer.dollar_for_antiquotation) in
 Plexer.dollar_for_antiquotation := false;
+let (lexer, pos) = Plexer.make_lexer () in
+Pcaml.position := pos;
 Grammar.Unsafe.gram_reinit gram lexer;
 Plexer.dollar_for_antiquotation := odfa;
 Grammar.Unsafe.clear_entry interf;
@@ -61,7 +61,6 @@ Grammar.Unsafe.clear_entry class_str_item;;
 
 Pcaml.parse_interf := Grammar.Entry.parse interf;;
 Pcaml.parse_implem := Grammar.Entry.parse implem;;
-Pcaml.position := pos;;
 
 let o2b =
   function

diff --git a/camlp4/ocaml_src/odyl/CVS/Entries b/camlp4/ocaml_src/odyl/CVS/Entries
new file mode 100644 (file)
index 0000000..4e3ee14
--- /dev/null
+++ b/camlp4/ocaml_src/odyl/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.3/Fri Sep  7 07:32:56 2001//Tocaml3083
+/.depend/1.8.2.3/Wed Aug 18 11:17:37 2004//Tocaml3083
+/Makefile/1.16.4.3/Wed Aug 18 11:17:37 2004//Tocaml3083
+/odyl.ml/1.3.6.1/Thu Jul  1 08:02:09 2004//Tocaml3083
+/odyl_main.ml/1.5.4.1/Thu Jul  1 08:03:46 2004//Tocaml3083
+/odyl_main.mli/1.2/Fri Dec 14 19:39:34 2001//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/odyl/CVS/Repository b/camlp4/ocaml_src/odyl/CVS/Repository
new file mode 100644 (file)
index 0000000..9989381
--- /dev/null
+++ b/camlp4/ocaml_src/odyl/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src/odyl

diff --git a/camlp4/ocaml_src/odyl/CVS/Root b/camlp4/ocaml_src/odyl/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/odyl/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/odyl/CVS/Tag b/camlp4/ocaml_src/odyl/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/odyl/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_src/tools/CVS/Entries b/camlp4/ocaml_src/tools/CVS/Entries
new file mode 100644 (file)
index 0000000..d01a464
--- /dev/null
+++ b/camlp4/ocaml_src/tools/CVS/Entries
@@ -0,0 +1,8 @@
+/camlp4_comm.mpw/1.2/Fri Jul 19 14:53:55 2002//Tocaml3083
+/camlp4_comm.sh/1.1/Fri Sep  7 07:22:07 2001//Tocaml3083
+/extract_crc.mpw/1.1/Thu Dec 13 13:59:25 2001//Tocaml3083
+/extract_crc.sh/1.4/Thu Jul 10 12:28:33 2003//Tocaml3083
+/ocamlc.mpw/1.1/Thu Dec 13 13:59:25 2001//Tocaml3083
+/ocamlc.sh/1.4/Sat Apr 27 14:45:31 2002//Tocaml3083
+/ocamlopt.sh/1.3/Sat Apr 27 14:45:31 2002//Tocaml3083
+D

diff --git a/camlp4/ocaml_src/tools/CVS/Repository b/camlp4/ocaml_src/tools/CVS/Repository
new file mode 100644 (file)
index 0000000..83a0562
--- /dev/null
+++ b/camlp4/ocaml_src/tools/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_src/tools

diff --git a/camlp4/ocaml_src/tools/CVS/Root b/camlp4/ocaml_src/tools/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_src/tools/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_src/tools/CVS/Tag b/camlp4/ocaml_src/tools/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_src/tools/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_stuff/CVS/Entries b/camlp4/ocaml_stuff/CVS/Entries
new file mode 100644 (file)
index 0000000..c4f42f6
--- /dev/null
+++ b/camlp4/ocaml_stuff/CVS/Entries
@@ -0,0 +1,3 @@
+D/otherlibs////
+D/parsing////
+D/utils////

diff --git a/camlp4/ocaml_stuff/CVS/Repository b/camlp4/ocaml_stuff/CVS/Repository
new file mode 100644 (file)
index 0000000..0cb5ab0
--- /dev/null
+++ b/camlp4/ocaml_stuff/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_stuff

diff --git a/camlp4/ocaml_stuff/CVS/Root b/camlp4/ocaml_stuff/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_stuff/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_stuff/CVS/Tag b/camlp4/ocaml_stuff/CVS/Tag
new file mode 100644 (file)
index 0000000..8b28f3e
--- /dev/null
+++ b/camlp4/ocaml_stuff/CVS/Tag
@@ -0,0 +1 @@
+Tocaml3083

diff --git a/camlp4/ocaml_stuff/otherlibs/CVS/Entries b/camlp4/ocaml_stuff/otherlibs/CVS/Entries
new file mode 100644 (file)
index 0000000..a34ce05
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/CVS/Entries
@@ -0,0 +1 @@
+D/dynlink////

diff --git a/camlp4/ocaml_stuff/otherlibs/CVS/Repository b/camlp4/ocaml_stuff/otherlibs/CVS/Repository
new file mode 100644 (file)
index 0000000..e9270e1
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_stuff/otherlibs

diff --git a/camlp4/ocaml_stuff/otherlibs/CVS/Root b/camlp4/ocaml_stuff/otherlibs/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_stuff/otherlibs/CVS/Tag b/camlp4/ocaml_stuff/otherlibs/CVS/Tag
new file mode 100644 (file)
index 0000000..8b28f3e
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/CVS/Tag
@@ -0,0 +1 @@
+Tocaml3083

diff --git a/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Entries b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Entries
new file mode 100644 (file)
index 0000000..fa58475
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Entries
@@ -0,0 +1,2 @@
+/.depend/1.3/Fri Jul 19 14:53:55 2002//Tocaml3083
+D

diff --git a/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Repository b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Repository
new file mode 100644 (file)
index 0000000..df7cb76
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_stuff/otherlibs/dynlink

diff --git a/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Root b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Tag b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_stuff/otherlibs/dynlink/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_stuff/parsing/CVS/Entries b/camlp4/ocaml_stuff/parsing/CVS/Entries
new file mode 100644 (file)
index 0000000..fa58475
--- /dev/null
+++ b/camlp4/ocaml_stuff/parsing/CVS/Entries
@@ -0,0 +1,2 @@
+/.depend/1.3/Fri Jul 19 14:53:55 2002//Tocaml3083
+D

diff --git a/camlp4/ocaml_stuff/parsing/CVS/Repository b/camlp4/ocaml_stuff/parsing/CVS/Repository
new file mode 100644 (file)
index 0000000..230f4a7
--- /dev/null
+++ b/camlp4/ocaml_stuff/parsing/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_stuff/parsing

diff --git a/camlp4/ocaml_stuff/parsing/CVS/Root b/camlp4/ocaml_stuff/parsing/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_stuff/parsing/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_stuff/parsing/CVS/Tag b/camlp4/ocaml_stuff/parsing/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_stuff/parsing/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocaml_stuff/utils/CVS/Entries b/camlp4/ocaml_stuff/utils/CVS/Entries
new file mode 100644 (file)
index 0000000..fa58475
--- /dev/null
+++ b/camlp4/ocaml_stuff/utils/CVS/Entries
@@ -0,0 +1,2 @@
+/.depend/1.3/Fri Jul 19 14:53:55 2002//Tocaml3083
+D

diff --git a/camlp4/ocaml_stuff/utils/CVS/Repository b/camlp4/ocaml_stuff/utils/CVS/Repository
new file mode 100644 (file)
index 0000000..6c7079f
--- /dev/null
+++ b/camlp4/ocaml_stuff/utils/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocaml_stuff/utils

diff --git a/camlp4/ocaml_stuff/utils/CVS/Root b/camlp4/ocaml_stuff/utils/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocaml_stuff/utils/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocaml_stuff/utils/CVS/Tag b/camlp4/ocaml_stuff/utils/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocaml_stuff/utils/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/ocpp/CVS/Entries b/camlp4/ocpp/CVS/Entries
new file mode 100644 (file)
index 0000000..26ec7e9
--- /dev/null
+++ b/camlp4/ocpp/CVS/Entries
@@ -0,0 +1,5 @@
+/.cvsignore/1.1/Fri Sep  7 07:57:04 2001//Tocaml3083
+/.depend/1.1/Fri Sep  7 07:57:04 2001//Tocaml3083
+/Makefile/1.6/Wed May 12 15:22:48 2004//Tocaml3083
+/ocpp.ml/1.6/Wed May 12 15:22:48 2004//Tocaml3083
+D

diff --git a/camlp4/ocpp/CVS/Repository b/camlp4/ocpp/CVS/Repository
new file mode 100644 (file)
index 0000000..2897f5d
--- /dev/null
+++ b/camlp4/ocpp/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/ocpp

diff --git a/camlp4/ocpp/CVS/Root b/camlp4/ocpp/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/ocpp/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/ocpp/CVS/Tag b/camlp4/ocpp/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/ocpp/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/odyl/.depend b/camlp4/odyl/.depend
index 3f125b7d3a3b71dcb8f127b64d241e4f969f941e..a26294403e87eafc19cb42e37ca92a15b78dc7a3 100644 (file)
--- a/camlp4/odyl/.depend
+++ b/camlp4/odyl/.depend
@@ -1,4 +1,4 @@
-odyl.cmo: odyl_config.cmo odyl_main.cmi 
-odyl.cmx: odyl_config.cmx odyl_main.cmx 
+odyl.cmo: odyl_main.cmi odyl_config.cmo 
+odyl.cmx: odyl_main.cmx odyl_config.cmx 
 odyl_main.cmo: odyl_config.cmo odyl_main.cmi 
 odyl_main.cmx: odyl_config.cmx odyl_main.cmi 

diff --git a/camlp4/odyl/CVS/Entries b/camlp4/odyl/CVS/Entries
new file mode 100644 (file)
index 0000000..51580ed
--- /dev/null
+++ b/camlp4/odyl/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.2/Thu Jul 10 12:28:34 2003//Tocaml3083
+/.depend/1.11.4.4/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.15.4.6/Wed Jul 28 13:11:07 2004//Tocaml3083
+/odyl.ml/1.2.6.1/Wed Jun 23 13:31:38 2004//Tocaml3083
+/odyl_main.ml/1.4.4.1/Wed Jun 23 14:43:58 2004//Tocaml3083
+/odyl_main.mli/1.2/Fri Jul 19 14:53:56 2002//Tocaml3083
+D

diff --git a/camlp4/odyl/CVS/Repository b/camlp4/odyl/CVS/Repository
new file mode 100644 (file)
index 0000000..1c13fa1
--- /dev/null
+++ b/camlp4/odyl/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/odyl

diff --git a/camlp4/odyl/CVS/Root b/camlp4/odyl/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/odyl/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/odyl/CVS/Tag b/camlp4/odyl/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/odyl/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/tools/CVS/Entries b/camlp4/tools/CVS/Entries
new file mode 100644 (file)
index 0000000..e0cf06f
--- /dev/null
+++ b/camlp4/tools/CVS/Entries
@@ -0,0 +1,10 @@
+/apply.sh/1.4.4.1/Wed Jul  7 16:22:26 2004//Tocaml3083
+/camlp4_comm.mpw/1.1/Thu Dec 13 13:59:25 2001//Tocaml3083
+/camlp4_comm.sh/1.9/Wed May 12 15:22:48 2004//Tocaml3083
+/conv.sh/1.4/Sun Nov 23 18:20:48 2003//Tocaml3083
+/extract_crc.mpw/1.1/Thu Dec 13 13:59:25 2001//Tocaml3083
+/extract_crc.sh/1.4/Thu Jul 10 12:28:35 2003//Tocaml3083
+/ocamlc.mpw/1.1/Thu Dec 13 13:59:25 2001//Tocaml3083
+/ocamlc.sh/1.4/Sat Apr 27 14:45:31 2002//Tocaml3083
+/ocamlopt.sh/1.3/Sat Apr 27 14:45:31 2002//Tocaml3083
+D

diff --git a/camlp4/tools/CVS/Repository b/camlp4/tools/CVS/Repository
new file mode 100644 (file)
index 0000000..7a5d012
--- /dev/null
+++ b/camlp4/tools/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/tools

diff --git a/camlp4/tools/CVS/Root b/camlp4/tools/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/tools/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/tools/CVS/Tag b/camlp4/tools/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/tools/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/top/.depend b/camlp4/top/.depend
index d7aebc7bc567395a7e8215517c1015ddeaad1cfc..0fd8a39ff4b124dd28e714cb18805ee780a12daa 100644 (file)
--- a/camlp4/top/.depend
+++ b/camlp4/top/.depend
@@ -1,14 +1,12 @@
-camlp4_top.cmo: ../camlp4/ast2pt.cmi ../camlp4/mLast.cmi \
-    $(OTOP)/parsing/parsetree.cmi ../camlp4/pcaml.cmi \
-    $(OTOP)/toplevel/topdirs.cmi $(OTOP)/toplevel/toploop.cmi \
-    $(OTOP)/utils/warnings.cmi 
-camlp4_top.cmx: ../camlp4/ast2pt.cmx ../camlp4/mLast.cmi \
-    $(OTOP)/parsing/parsetree.cmi ../camlp4/pcaml.cmx \
-    $(OTOP)/toplevel/topdirs.cmx $(OTOP)/toplevel/toploop.cmx \
-    $(OTOP)/utils/warnings.cmx 
-oprint.cmo: $(OTOP)/typing/outcometree.cmi $(OTOP)/toplevel/toploop.cmi 
-oprint.cmx: $(OTOP)/typing/outcometree.cmi $(OTOP)/toplevel/toploop.cmx 
-rprint.cmo: $(OTOP)/parsing/asttypes.cmi $(OTOP)/typing/outcometree.cmi \
-    $(OTOP)/toplevel/toploop.cmi 
-rprint.cmx: $(OTOP)/parsing/asttypes.cmi $(OTOP)/typing/outcometree.cmi \
-    $(OTOP)/toplevel/toploop.cmx 
+camlp4_top.cmo: $(OTOP)/utils/warnings.cmi $(OTOP)/toplevel/toploop.cmi \
+    $(OTOP)/toplevel/topdirs.cmi ../camlp4/pcaml.cmi \
+    $(OTOP)/parsing/parsetree.cmi ../camlp4/mLast.cmi ../camlp4/ast2pt.cmi 
+camlp4_top.cmx: $(OTOP)/utils/warnings.cmx $(OTOP)/toplevel/toploop.cmx \
+    $(OTOP)/toplevel/topdirs.cmx ../camlp4/pcaml.cmx \
+    $(OTOP)/parsing/parsetree.cmi ../camlp4/mLast.cmi ../camlp4/ast2pt.cmx 
+oprint.cmo: $(OTOP)/toplevel/toploop.cmi $(OTOP)/typing/outcometree.cmi 
+oprint.cmx: $(OTOP)/toplevel/toploop.cmx $(OTOP)/typing/outcometree.cmi 
+rprint.cmo: $(OTOP)/toplevel/toploop.cmi $(OTOP)/typing/outcometree.cmi \
+    $(OTOP)/parsing/asttypes.cmi 
+rprint.cmx: $(OTOP)/toplevel/toploop.cmx $(OTOP)/typing/outcometree.cmi \
+    $(OTOP)/parsing/asttypes.cmi 

diff --git a/camlp4/top/CVS/Entries b/camlp4/top/CVS/Entries
new file mode 100644 (file)
index 0000000..9e35ea9
--- /dev/null
+++ b/camlp4/top/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.1/Fri Sep  7 07:54:49 2001//Tocaml3083
+/.depend/1.9.4.1/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.12.2.1/Fri Jul  9 15:10:57 2004//Tocaml3083
+/camlp4_top.ml/1.13.2.1/Thu Oct  7 09:18:13 2004//Tocaml3083
+/oprint.ml/1.6/Tue Sep 23 12:52:34 2003//Tocaml3083
+/rprint.ml/1.14/Sat Jun 12 08:55:46 2004//Tocaml3083
+D

diff --git a/camlp4/top/CVS/Repository b/camlp4/top/CVS/Repository
new file mode 100644 (file)
index 0000000..a3a5585
--- /dev/null
+++ b/camlp4/top/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/top

diff --git a/camlp4/top/CVS/Root b/camlp4/top/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/top/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/top/CVS/Tag b/camlp4/top/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/top/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/CVS/Entries b/camlp4/unmaintained/CVS/Entries
new file mode 100644 (file)
index 0000000..5e12be7
--- /dev/null
+++ b/camlp4/unmaintained/CVS/Entries
@@ -0,0 +1,7 @@
+/Makefile/1.1.2.1/Wed Jul  7 16:33:14 2004//Tocaml3083
+D/format////
+D/lefteval////
+D/ocamllex////
+D/olabl////
+D/scheme////
+D/sml////

diff --git a/camlp4/unmaintained/CVS/Repository b/camlp4/unmaintained/CVS/Repository
new file mode 100644 (file)
index 0000000..1134a33
--- /dev/null
+++ b/camlp4/unmaintained/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained

diff --git a/camlp4/unmaintained/CVS/Root b/camlp4/unmaintained/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/CVS/Tag b/camlp4/unmaintained/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/format/CVS/Entries b/camlp4/unmaintained/format/CVS/Entries
new file mode 100644 (file)
index 0000000..a667f7b
--- /dev/null
+++ b/camlp4/unmaintained/format/CVS/Entries
@@ -0,0 +1,5 @@
+/.depend/1.1.2.1/Wed Jul  7 16:22:26 2004//Tocaml3083
+/Makefile/1.1.2.1/Wed Jul  7 16:22:26 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:22:27 2004//Tocaml3083
+/pa_format.ml/1.1.2.1/Wed Jul  7 16:22:27 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/format/CVS/Repository b/camlp4/unmaintained/format/CVS/Repository
new file mode 100644 (file)
index 0000000..e37de8b
--- /dev/null
+++ b/camlp4/unmaintained/format/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/format

diff --git a/camlp4/unmaintained/format/CVS/Root b/camlp4/unmaintained/format/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/format/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/format/CVS/Tag b/camlp4/unmaintained/format/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/format/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/lefteval/CVS/Entries b/camlp4/unmaintained/lefteval/CVS/Entries
new file mode 100644 (file)
index 0000000..05a75eb
--- /dev/null
+++ b/camlp4/unmaintained/lefteval/CVS/Entries
@@ -0,0 +1,5 @@
+/.depend/1.1.2.1/Wed Jul  7 16:22:27 2004//Tocaml3083
+/Makefile/1.1.2.1/Wed Jul  7 16:22:28 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:22:28 2004//Tocaml3083
+/pa_lefteval.ml/1.1.2.1/Wed Jul  7 16:22:28 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/lefteval/CVS/Repository b/camlp4/unmaintained/lefteval/CVS/Repository
new file mode 100644 (file)
index 0000000..05356c5
--- /dev/null
+++ b/camlp4/unmaintained/lefteval/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/lefteval

diff --git a/camlp4/unmaintained/lefteval/CVS/Root b/camlp4/unmaintained/lefteval/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/lefteval/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/lefteval/CVS/Tag b/camlp4/unmaintained/lefteval/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/lefteval/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/ocamllex/CVS/Entries b/camlp4/unmaintained/ocamllex/CVS/Entries
new file mode 100644 (file)
index 0000000..50c04b9
--- /dev/null
+++ b/camlp4/unmaintained/ocamllex/CVS/Entries
@@ -0,0 +1,4 @@
+/Makefile/1.1.2.1/Wed Jul  7 16:22:29 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:22:29 2004//Tocaml3083
+/pa_ocamllex.ml/1.1.2.1/Wed Jul  7 16:22:29 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/ocamllex/CVS/Repository b/camlp4/unmaintained/ocamllex/CVS/Repository
new file mode 100644 (file)
index 0000000..305a0be
--- /dev/null
+++ b/camlp4/unmaintained/ocamllex/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/ocamllex

diff --git a/camlp4/unmaintained/ocamllex/CVS/Root b/camlp4/unmaintained/ocamllex/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/ocamllex/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/ocamllex/CVS/Tag b/camlp4/unmaintained/ocamllex/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/ocamllex/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/olabl/CVS/Entries b/camlp4/unmaintained/olabl/CVS/Entries
new file mode 100644 (file)
index 0000000..76b4000
--- /dev/null
+++ b/camlp4/unmaintained/olabl/CVS/Entries
@@ -0,0 +1,5 @@
+/.depend/1.1.2.1/Wed Jul  7 16:22:30 2004//Tocaml3083
+/Makefile/1.1.2.1/Wed Jul  7 16:22:31 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:22:31 2004//Tocaml3083
+/pa_olabl.ml/1.1.2.1/Wed Jul  7 16:22:31 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/olabl/CVS/Repository b/camlp4/unmaintained/olabl/CVS/Repository
new file mode 100644 (file)
index 0000000..a48587f
--- /dev/null
+++ b/camlp4/unmaintained/olabl/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/olabl

diff --git a/camlp4/unmaintained/olabl/CVS/Root b/camlp4/unmaintained/olabl/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/olabl/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/olabl/CVS/Tag b/camlp4/unmaintained/olabl/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/olabl/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/scheme/CVS/Entries b/camlp4/unmaintained/scheme/CVS/Entries
new file mode 100644 (file)
index 0000000..2915d04
--- /dev/null
+++ b/camlp4/unmaintained/scheme/CVS/Entries
@@ -0,0 +1,8 @@
+/.depend/1.1.2.1/Wed Jul  7 16:22:32 2004//Tocaml3083
+/Makefile/1.1.2.1/Wed Jul  7 16:22:32 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:22:32 2004//Tocaml3083
+/pa_scheme.ml/1.1.2.1/Wed Jul  7 16:22:32 2004//Tocaml3083
+/pa_scheme.sc/1.1.2.1/Wed Jul  7 16:22:33 2004//Tocaml3083
+/pr_scheme.ml/1.1.2.1/Wed Jul  7 16:22:33 2004//Tocaml3083
+/pr_schp_main.ml/1.1.2.1/Wed Jul  7 16:22:34 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/scheme/CVS/Repository b/camlp4/unmaintained/scheme/CVS/Repository
new file mode 100644 (file)
index 0000000..6cb7772
--- /dev/null
+++ b/camlp4/unmaintained/scheme/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/scheme

diff --git a/camlp4/unmaintained/scheme/CVS/Root b/camlp4/unmaintained/scheme/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/scheme/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/scheme/CVS/Tag b/camlp4/unmaintained/scheme/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/scheme/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/camlp4/unmaintained/sml/CVS/Entries b/camlp4/unmaintained/sml/CVS/Entries
new file mode 100644 (file)
index 0000000..56c3802
--- /dev/null
+++ b/camlp4/unmaintained/sml/CVS/Entries
@@ -0,0 +1,6 @@
+/.depend/1.1.2.1/Wed Jul  7 16:37:09 2004//Tocaml3083
+/Makefile/1.1.2.1/Wed Jul  7 16:37:10 2004//Tocaml3083
+/README/1.1.2.1/Wed Jul  7 16:37:10 2004//Tocaml3083
+/pa_sml.ml/1.1.2.1/Wed Jul  7 16:37:10 2004//Tocaml3083
+/smllib.sml/1.1.2.1/Wed Jul  7 16:37:11 2004//Tocaml3083
+D

diff --git a/camlp4/unmaintained/sml/CVS/Repository b/camlp4/unmaintained/sml/CVS/Repository
new file mode 100644 (file)
index 0000000..22ddc3e
--- /dev/null
+++ b/camlp4/unmaintained/sml/CVS/Repository
@@ -0,0 +1 @@
+csl/camlp4/unmaintained/sml

diff --git a/camlp4/unmaintained/sml/CVS/Root b/camlp4/unmaintained/sml/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/camlp4/unmaintained/sml/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/camlp4/unmaintained/sml/CVS/Tag b/camlp4/unmaintained/sml/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/camlp4/unmaintained/sml/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/config/CVS/Entries b/config/CVS/Entries
new file mode 100644 (file)
index 0000000..ce54b03
--- /dev/null
+++ b/config/CVS/Entries
@@ -0,0 +1,9 @@
+/.cvsignore/1.2/Thu Feb 15 16:18:54 1996//Tocaml3083
+/Makefile-templ/1.29/Sat Jun 19 16:17:31 2004//Tocaml3083
+/Makefile.mingw/1.12/Thu Apr  1 13:08:56 2004//Tocaml3083
+/Makefile.msvc/1.12.4.2/Wed Feb  2 15:39:40 2005//Tocaml3083
+/m-nt.h/1.10/Fri Jun  7 09:49:37 2002//Tocaml3083
+/m-templ.h/1.14/Fri Dec  7 13:39:40 2001//Tocaml3083
+/s-nt.h/1.12/Tue Jun 18 13:00:55 2002//Tocaml3083
+/s-templ.h/1.22/Tue May 18 08:50:22 2004//Tocaml3083
+D

diff --git a/config/CVS/Entries.Log b/config/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..4d297bf
--- /dev/null
+++ b/config/CVS/Entries.Log
@@ -0,0 +1,2 @@
+A D/auto-aux////
+A D/gnu////

diff --git a/config/CVS/Repository b/config/CVS/Repository
new file mode 100644 (file)
index 0000000..4e8e931
--- /dev/null
+++ b/config/CVS/Repository
@@ -0,0 +1 @@
+csl/config

diff --git a/config/CVS/Root b/config/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/config/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/config/CVS/Tag b/config/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/config/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index 29d8d3d3942d446b6b6738c4bb206d0fb165572b..0ea6ea778263f0b6830678a7755288b6fa771933 100644 (file)
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -11,13 +11,13 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile.msvc,v 1.12 2004/04/01 13:08:56 xleroy Exp $
+# $Id: Makefile.msvc,v 1.12.4.2 2005/02/02 15:39:40 xleroy Exp $
 
 # Configuration for Windows, Visual C++ compiler
 
 ######### General configuration
 
-PREFIX=C:/ocaml
+PREFIX=C:/ocamlms
 
 ### Where to install the binaries.
 BINDIR=$(PREFIX)/bin
@@ -67,7 +67,7 @@ CPP=cl /nologo /EP
 MKDLL=link /nologo /dll /out:$(1) /implib:$(2) $(3)
 
 ### How to build a static library
-MKLIB=lib /nologo /debugtype:CV /out:$(1) $(2)
+MKLIB=link /lib /nologo /debugtype:CV /out:$(1) $(2)
 
 ### Canonicalize the name of a system library
 SYSLIB=$(1).lib

diff --git a/config/auto-aux/CVS/Entries b/config/auto-aux/CVS/Entries
new file mode 100644 (file)
index 0000000..e62a8fa
--- /dev/null
+++ b/config/auto-aux/CVS/Entries
@@ -0,0 +1,29 @@
+/align.c/1.7/Fri Dec  7 13:39:41 2001//Tocaml3083
+/ansi.c/1.4/Fri Dec  7 13:39:41 2001//Tocaml3083
+/async_io.c/1.8/Tue Feb 11 14:05:36 2003//Tocaml3083
+/bytecopy.c/1.7/Fri Dec  7 13:39:43 2001//Tocaml3083
+/dblalign.c/1.9/Fri Dec  7 13:39:43 2001//Tocaml3083
+/divmod.c/1.3/Tue Dec 30 23:59:47 2003//Tocaml3083
+/elf.c/1.4/Fri Dec  7 13:39:43 2001//Tocaml3083
+/endian.c/1.8/Fri Dec  7 13:39:43 2001//Tocaml3083
+/getgroups.c/1.8/Fri Dec  7 13:39:43 2001//Tocaml3083
+/gethostbyaddr.c/1.2/Mon May  6 08:29:52 2002//Tocaml3083
+/gethostbyname.c/1.2/Mon May  6 08:29:52 2002//Tocaml3083
+/hasgot/1.9/Fri Apr  9 13:23:11 2004//Tocaml3083
+/ia32sse2.c/1.1.6.1/Mon Jan 31 17:25:42 2005//Tocaml3083
+/int64align.c/1.2/Fri Dec  7 13:39:43 2001//Tocaml3083
+/longlong.c/1.4/Sat May 25 08:33:26 2002//Tocaml3083
+/runtest/1.5/Thu Sep  6 08:52:21 2001//Tocaml3083
+/schar.c/1.8/Fri Dec  7 13:39:44 2001//Tocaml3083
+/schar2.c/1.8/Fri Dec  7 13:39:44 2001//Tocaml3083
+/searchpath/1.1/Tue Feb 13 16:26:44 1996//Tocaml3083
+/sharpbang/1.1/Tue Feb 13 16:26:45 1996//Tocaml3083
+/sharpbang2/1.1/Wed Jul 16 14:22:26 2003//Tocaml3083
+/sighandler.c/1.7/Fri Dec  7 13:39:44 2001//Tocaml3083
+/signals.c/1.7/Fri Dec  7 13:39:44 2001//Tocaml3083
+/sizes.c/1.9/Fri Dec  7 13:39:44 2001//Tocaml3083
+/solaris-ld/1.2/Tue Aug 28 14:47:18 2001/-kk/Tocaml3083
+/stackov.c/1.4/Wed Jul 23 07:57:17 2003//Tocaml3083
+/tclversion.c/1.3/Wed Aug 20 15:11:52 2003//Tocaml3083
+/trycompile/1.1/Sat May  4 09:58:01 2002//Tocaml3083
+D

diff --git a/config/auto-aux/CVS/Repository b/config/auto-aux/CVS/Repository
new file mode 100644 (file)
index 0000000..03597e0
--- /dev/null
+++ b/config/auto-aux/CVS/Repository
@@ -0,0 +1 @@
+csl/config/auto-aux

diff --git a/config/auto-aux/CVS/Root b/config/auto-aux/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/config/auto-aux/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/config/auto-aux/CVS/Tag b/config/auto-aux/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/config/auto-aux/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/config/auto-aux/ia32sse2.c b/config/auto-aux/ia32sse2.c
index fc2b4e43ec12160a4ebffd17420a7a912fb3a9ca..e343aaf7f1c9c6fa64fa36f51543c22ccf63ecc2 100644 (file)
--- a/config/auto-aux/ia32sse2.c
+++ b/config/auto-aux/ia32sse2.c
@@ -11,12 +11,14 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: ia32sse2.c,v 1.1 2003/10/24 09:18:01 xleroy Exp $ */
+/* $Id: ia32sse2.c,v 1.1.6.1 2005/01/31 17:25:42 doligez Exp $ */
 
 /* Test whether IA32 assembler supports SSE2 instructions */
 
 int main()
 {
   asm("pmuludq %mm1, %mm0");
+  asm("paddq %mm1, %mm0");
+  asm("psubq %mm1, %mm0");
   return 0;
 }

diff --git a/config/gnu/CVS/Entries b/config/gnu/CVS/Entries
new file mode 100644 (file)
index 0000000..7516e9c
--- /dev/null
+++ b/config/gnu/CVS/Entries
@@ -0,0 +1,3 @@
+/config.guess/1.4/Mon Feb 16 12:37:15 2004//Tocaml3083
+/config.sub/1.1.1.3/Mon Feb 16 12:30:04 2004//Tocaml3083
+D

diff --git a/config/gnu/CVS/Repository b/config/gnu/CVS/Repository
new file mode 100644 (file)
index 0000000..6b52af6
--- /dev/null
+++ b/config/gnu/CVS/Repository
@@ -0,0 +1 @@
+csl/config/gnu

diff --git a/config/gnu/CVS/Root b/config/gnu/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/config/gnu/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/config/gnu/CVS/Tag b/config/gnu/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/config/gnu/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/configure b/configure
index d30207bba363efba7ecee3c57447e9c96ca2a2ba..fd28ce8de8241e94375850736784c3298cf4d1f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,7 +13,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: configure,v 1.215.2.8 2004/11/18 14:08:57 doligez Exp $
+# $Id: configure,v 1.215.2.9 2005/01/24 15:22:46 doligez Exp $
 
 configure_options="$*"
 prefix=/usr/local
@@ -663,31 +663,41 @@ esac
 # Where are GNU binutils?
 
 binutils_objcopy=''
+binutils_install_objcopy=':'
 binutils_nm=''
 
-if test "$arch" != "none"; then
-  binutils_path="${binutils_dir}:${PATH}:/usr/libexec/binutils"
-  old_IFS="$IFS"
-  IFS=':'
-  for d in ${binutils_path}; do
-    if test -z "$d"; then continue; fi
-    if test -f "$d/objcopy" && test -f "$d/nm"; then
-      echo "objcopy and nm found in $d"
-      if test `$d/objcopy --help | grep -s -c 'redefine-sym'` -eq 0; then
-        echo "$d/objcopy does not support option --redefine-sym, discarded"
-        continue;
-      fi
-      if test `$d/nm --version | grep -s -c 'GNU nm'` -eq 0; then
-        echo "$d/nm is not from GNU binutils, discarded"
-        continue;
-      fi
-      binutils_objcopy="$d/objcopy"
-      binutils_nm="$d/nm"
-      break
+case "$host" in
+  powerpc-*-darwin*)
+    binutils_objcopy='$(LIBDIR)/ocaml-objcopy'
+    binutils_install_objcopy=cp
+    binutils_nm=/usr/bin/nm
+  ;;
+  *)
+    if test "$arch" != "none"; then
+      binutils_path="${binutils_dir}:${PATH}:/usr/libexec/binutils"
+      old_IFS="$IFS"
+      IFS=':'
+      for d in ${binutils_path}; do
+        if test -z "$d"; then continue; fi
+        if test -f "$d/objcopy" && test -f "$d/nm"; then
+          echo "objcopy and nm found in $d"
+          if test `$d/objcopy --help | grep -s -c 'redefine-sym'` -eq 0; then
+            echo "$d/objcopy does not support option --redefine-sym, discarded"
+            continue;
+          fi
+          if test `$d/nm --version | grep -s -c 'GNU nm'` -eq 0; then
+            echo "$d/nm is not from GNU binutils, discarded"
+            continue;
+          fi
+          binutils_objcopy="$d/objcopy"
+          binutils_nm="$d/nm"
+          break
+        fi
+      done
+      IFS="$old_IFS"
     fi
-  done
-  IFS="$old_IFS"
-fi
+  ;;
+esac
 
 # Where is ranlib?
 
@@ -1474,6 +1484,7 @@ echo "ASPPFLAGS=$asppflags" >> Makefile
 echo "ASPPPROFFLAGS=$asppprofflags" >> Makefile
 echo "PROFILING=$profiling" >> Makefile
 echo "BINUTILS_OBJCOPY=$binutils_objcopy" >> Makefile
+echo "BINUTILS_INSTALL_OBJCOPY=$binutils_install_objcopy" >> Makefile
 echo "BINUTILS_NM=$binutils_nm" >> Makefile
 echo "DYNLINKOPTS=$dllib" >> Makefile
 echo "OTHERLIBRARIES=$otherlibraries" >> Makefile

diff --git a/debugger/.depend b/debugger/.depend
index 930900400f90f5a7225f7849b88a3a9f3d371230..54cbb5e7290bbda8a95d6ef3d5d02cf620be3c3a 100644 (file)
--- a/debugger/.depend
+++ b/debugger/.depend
@@ -1,190 +1,190 @@
-breakpoints.cmi: ../bytecomp/instruct.cmi primitives.cmi 
-checkpoints.cmi: debugcom.cmi primitives.cmi 
+breakpoints.cmi: primitives.cmi ../bytecomp/instruct.cmi 
+checkpoints.cmi: primitives.cmi debugcom.cmi 
 debugcom.cmi: primitives.cmi 
-envaux.cmi: ../typing/env.cmi ../bytecomp/instruct.cmi ../typing/path.cmi 
-eval.cmi: debugcom.cmi ../typing/env.cmi ../typing/ident.cmi \
-    ../bytecomp/instruct.cmi ../parsing/longident.cmi parser_aux.cmi \
-    ../typing/path.cmi ../typing/types.cmi 
+envaux.cmi: ../typing/path.cmi ../bytecomp/instruct.cmi ../typing/env.cmi 
+eval.cmi: ../typing/types.cmi ../typing/path.cmi parser_aux.cmi \
+    ../parsing/longident.cmi ../bytecomp/instruct.cmi ../typing/ident.cmi \
+    ../typing/env.cmi debugcom.cmi 
 events.cmi: ../bytecomp/instruct.cmi 
-frames.cmi: ../bytecomp/instruct.cmi primitives.cmi 
+frames.cmi: primitives.cmi ../bytecomp/instruct.cmi 
 input_handling.cmi: primitives.cmi 
 lexer.cmi: parser.cmi 
-loadprinter.cmi: ../otherlibs/dynlink/dynlink.cmi ../parsing/longident.cmi 
-parser.cmi: ../parsing/longident.cmi parser_aux.cmi 
-parser_aux.cmi: ../parsing/longident.cmi primitives.cmi 
-pattern_matching.cmi: debugcom.cmi parser_aux.cmi ../typing/typedtree.cmi 
+loadprinter.cmi: ../parsing/longident.cmi ../otherlibs/dynlink/dynlink.cmi 
+parser.cmi: parser_aux.cmi ../parsing/longident.cmi 
+parser_aux.cmi: primitives.cmi ../parsing/longident.cmi 
+pattern_matching.cmi: ../typing/typedtree.cmi parser_aux.cmi debugcom.cmi 
 pos.cmi: ../bytecomp/instruct.cmi 
 primitives.cmi: ../otherlibs/unix/unix.cmi 
-printval.cmi: debugcom.cmi ../typing/env.cmi parser_aux.cmi \
-    ../typing/path.cmi ../typing/types.cmi 
+printval.cmi: ../typing/types.cmi ../typing/path.cmi parser_aux.cmi \
+    ../typing/env.cmi debugcom.cmi 
 program_loading.cmi: primitives.cmi 
 show_information.cmi: ../bytecomp/instruct.cmi 
 symbols.cmi: ../bytecomp/instruct.cmi 
 time_travel.cmi: primitives.cmi 
 unix_tools.cmi: ../otherlibs/unix/unix.cmi 
-breakpoints.cmo: checkpoints.cmi debugcom.cmi exec.cmi \
-    ../bytecomp/instruct.cmi pos.cmi primitives.cmi source.cmi symbols.cmi \
+breakpoints.cmo: symbols.cmi source.cmi primitives.cmi pos.cmi \
+    ../bytecomp/instruct.cmi exec.cmi debugcom.cmi checkpoints.cmi \
     breakpoints.cmi 
-breakpoints.cmx: checkpoints.cmx debugcom.cmx exec.cmx \
-    ../bytecomp/instruct.cmx pos.cmx primitives.cmx source.cmx symbols.cmx \
+breakpoints.cmx: symbols.cmx source.cmx primitives.cmx pos.cmx \
+    ../bytecomp/instruct.cmx exec.cmx debugcom.cmx checkpoints.cmx \
     breakpoints.cmi 
-checkpoints.cmo: debugcom.cmi int64ops.cmi primitives.cmi checkpoints.cmi 
-checkpoints.cmx: debugcom.cmx int64ops.cmx primitives.cmx checkpoints.cmi 
-command_line.cmo: breakpoints.cmi checkpoints.cmi ../utils/config.cmi \
-    ../typing/ctype.cmi debugcom.cmi debugger_config.cmi envaux.cmi eval.cmi \
-    events.cmi frames.cmi history.cmi input_handling.cmi \
-    ../bytecomp/instruct.cmi int64ops.cmi lexer.cmi loadprinter.cmi \
-    ../utils/misc.cmi parameters.cmi parser.cmi parser_aux.cmi pos.cmi \
-    primitives.cmi printval.cmi program_loading.cmi program_management.cmi \
-    show_information.cmi show_source.cmi source.cmi symbols.cmi \
-    time_travel.cmi ../typing/types.cmi ../otherlibs/unix/unix.cmi \
-    unix_tools.cmi command_line.cmi 
-command_line.cmx: breakpoints.cmx checkpoints.cmx ../utils/config.cmx \
-    ../typing/ctype.cmx debugcom.cmx debugger_config.cmx envaux.cmx eval.cmx \
-    events.cmx frames.cmx history.cmx input_handling.cmx \
-    ../bytecomp/instruct.cmx int64ops.cmx lexer.cmx loadprinter.cmx \
-    ../utils/misc.cmx parameters.cmx parser.cmx parser_aux.cmi pos.cmx \
-    primitives.cmx printval.cmx program_loading.cmx program_management.cmx \
-    show_information.cmx show_source.cmx source.cmx symbols.cmx \
-    time_travel.cmx ../typing/types.cmx ../otherlibs/unix/unix.cmx \
-    unix_tools.cmx command_line.cmi 
-debugcom.cmo: input_handling.cmi int64ops.cmi ../utils/misc.cmi \
-    primitives.cmi debugcom.cmi 
-debugcom.cmx: input_handling.cmx int64ops.cmx ../utils/misc.cmx \
-    primitives.cmx debugcom.cmi 
+checkpoints.cmo: primitives.cmi int64ops.cmi debugcom.cmi checkpoints.cmi 
+checkpoints.cmx: primitives.cmx int64ops.cmx debugcom.cmx checkpoints.cmi 
+command_line.cmo: unix_tools.cmi ../otherlibs/unix/unix.cmi \
+    ../typing/types.cmi time_travel.cmi symbols.cmi source.cmi \
+    show_source.cmi show_information.cmi program_management.cmi \
+    program_loading.cmi printval.cmi primitives.cmi pos.cmi parser_aux.cmi \
+    parser.cmi parameters.cmi ../utils/misc.cmi loadprinter.cmi lexer.cmi \
+    int64ops.cmi ../bytecomp/instruct.cmi input_handling.cmi history.cmi \
+    frames.cmi events.cmi eval.cmi envaux.cmi debugger_config.cmi \
+    debugcom.cmi ../typing/ctype.cmi ../utils/config.cmi checkpoints.cmi \
+    breakpoints.cmi command_line.cmi 
+command_line.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx \
+    ../typing/types.cmx time_travel.cmx symbols.cmx source.cmx \
+    show_source.cmx show_information.cmx program_management.cmx \
+    program_loading.cmx printval.cmx primitives.cmx pos.cmx parser_aux.cmi \
+    parser.cmx parameters.cmx ../utils/misc.cmx loadprinter.cmx lexer.cmx \
+    int64ops.cmx ../bytecomp/instruct.cmx input_handling.cmx history.cmx \
+    frames.cmx events.cmx eval.cmx envaux.cmx debugger_config.cmx \
+    debugcom.cmx ../typing/ctype.cmx ../utils/config.cmx checkpoints.cmx \
+    breakpoints.cmx command_line.cmi 
+debugcom.cmo: primitives.cmi ../utils/misc.cmi int64ops.cmi \
+    input_handling.cmi debugcom.cmi 
+debugcom.cmx: primitives.cmx ../utils/misc.cmx int64ops.cmx \
+    input_handling.cmx debugcom.cmi 
 debugger_config.cmo: int64ops.cmi debugger_config.cmi 
 debugger_config.cmx: int64ops.cmx debugger_config.cmi 
-envaux.cmo: ../typing/env.cmi ../bytecomp/instruct.cmi ../utils/misc.cmi \
-    ../typing/mtype.cmi ../typing/path.cmi ../typing/printtyp.cmi \
-    ../typing/types.cmi envaux.cmi 
-envaux.cmx: ../typing/env.cmx ../bytecomp/instruct.cmx ../utils/misc.cmx \
-    ../typing/mtype.cmx ../typing/path.cmx ../typing/printtyp.cmx \
-    ../typing/types.cmx envaux.cmi 
-eval.cmo: ../typing/btype.cmi ../typing/ctype.cmi debugcom.cmi \
-    debugger_config.cmi ../typing/env.cmi frames.cmi ../typing/ident.cmi \
-    ../bytecomp/instruct.cmi ../parsing/longident.cmi ../utils/misc.cmi \
-    parser_aux.cmi ../typing/path.cmi ../typing/predef.cmi \
-    ../typing/printtyp.cmi printval.cmi ../bytecomp/symtable.cmi \
-    ../typing/types.cmi eval.cmi 
-eval.cmx: ../typing/btype.cmx ../typing/ctype.cmx debugcom.cmx \
-    debugger_config.cmx ../typing/env.cmx frames.cmx ../typing/ident.cmx \
-    ../bytecomp/instruct.cmx ../parsing/longident.cmx ../utils/misc.cmx \
-    parser_aux.cmi ../typing/path.cmx ../typing/predef.cmx \
-    ../typing/printtyp.cmx printval.cmx ../bytecomp/symtable.cmx \
-    ../typing/types.cmx eval.cmi 
-events.cmo: checkpoints.cmi ../bytecomp/instruct.cmi primitives.cmi \
-    symbols.cmi events.cmi 
-events.cmx: checkpoints.cmx ../bytecomp/instruct.cmx primitives.cmx \
-    symbols.cmx events.cmi 
+envaux.cmo: ../typing/types.cmi ../typing/printtyp.cmi ../typing/path.cmi \
+    ../typing/mtype.cmi ../utils/misc.cmi ../bytecomp/instruct.cmi \
+    ../typing/env.cmi envaux.cmi 
+envaux.cmx: ../typing/types.cmx ../typing/printtyp.cmx ../typing/path.cmx \
+    ../typing/mtype.cmx ../utils/misc.cmx ../bytecomp/instruct.cmx \
+    ../typing/env.cmx envaux.cmi 
+eval.cmo: ../typing/types.cmi ../bytecomp/symtable.cmi printval.cmi \
+    ../typing/printtyp.cmi ../typing/predef.cmi ../typing/path.cmi \
+    parser_aux.cmi ../utils/misc.cmi ../parsing/longident.cmi \
+    ../bytecomp/instruct.cmi ../typing/ident.cmi frames.cmi ../typing/env.cmi \
+    debugger_config.cmi debugcom.cmi ../typing/ctype.cmi ../typing/btype.cmi \
+    eval.cmi 
+eval.cmx: ../typing/types.cmx ../bytecomp/symtable.cmx printval.cmx \
+    ../typing/printtyp.cmx ../typing/predef.cmx ../typing/path.cmx \
+    parser_aux.cmi ../utils/misc.cmx ../parsing/longident.cmx \
+    ../bytecomp/instruct.cmx ../typing/ident.cmx frames.cmx ../typing/env.cmx \
+    debugger_config.cmx debugcom.cmx ../typing/ctype.cmx ../typing/btype.cmx \
+    eval.cmi 
+events.cmo: symbols.cmi primitives.cmi ../bytecomp/instruct.cmi \
+    checkpoints.cmi events.cmi 
+events.cmx: symbols.cmx primitives.cmx ../bytecomp/instruct.cmx \
+    checkpoints.cmx events.cmi 
 exec.cmo: exec.cmi 
 exec.cmx: exec.cmi 
-frames.cmo: checkpoints.cmi debugcom.cmi events.cmi ../bytecomp/instruct.cmi \
-    ../utils/misc.cmi primitives.cmi symbols.cmi frames.cmi 
-frames.cmx: checkpoints.cmx debugcom.cmx events.cmx ../bytecomp/instruct.cmx \
-    ../utils/misc.cmx primitives.cmx symbols.cmx frames.cmi 
-history.cmo: checkpoints.cmi debugger_config.cmi int64ops.cmi \
-    ../utils/misc.cmi primitives.cmi history.cmi 
-history.cmx: checkpoints.cmx debugger_config.cmx int64ops.cmx \
-    ../utils/misc.cmx primitives.cmx history.cmi 
-input_handling.cmo: lexer.cmi primitives.cmi ../otherlibs/unix/unix.cmi \
+frames.cmo: symbols.cmi primitives.cmi ../utils/misc.cmi \
+    ../bytecomp/instruct.cmi events.cmi debugcom.cmi checkpoints.cmi \
+    frames.cmi 
+frames.cmx: symbols.cmx primitives.cmx ../utils/misc.cmx \
+    ../bytecomp/instruct.cmx events.cmx debugcom.cmx checkpoints.cmx \
+    frames.cmi 
+history.cmo: primitives.cmi ../utils/misc.cmi int64ops.cmi \
+    debugger_config.cmi checkpoints.cmi history.cmi 
+history.cmx: primitives.cmx ../utils/misc.cmx int64ops.cmx \
+    debugger_config.cmx checkpoints.cmx history.cmi 
+input_handling.cmo: ../otherlibs/unix/unix.cmi primitives.cmi lexer.cmi \
     input_handling.cmi 
-input_handling.cmx: lexer.cmx primitives.cmx ../otherlibs/unix/unix.cmx \
+input_handling.cmx: ../otherlibs/unix/unix.cmx primitives.cmx lexer.cmx \
     input_handling.cmi 
 int64ops.cmo: int64ops.cmi 
 int64ops.cmx: int64ops.cmi 
-lexer.cmo: parser.cmi primitives.cmi lexer.cmi 
-lexer.cmx: parser.cmx primitives.cmx lexer.cmi 
-loadprinter.cmo: ../utils/config.cmi ../typing/ctype.cmi debugger_config.cmi \
-    ../otherlibs/dynlink/dynlink.cmi ../typing/env.cmi ../typing/ident.cmi \
-    ../parsing/longident.cmi ../utils/misc.cmi ../typing/path.cmi \
-    ../typing/printtyp.cmi printval.cmi ../bytecomp/symtable.cmi \
-    ../typing/types.cmi loadprinter.cmi 
-loadprinter.cmx: ../utils/config.cmx ../typing/ctype.cmx debugger_config.cmx \
-    ../otherlibs/dynlink/dynlink.cmx ../typing/env.cmx ../typing/ident.cmx \
-    ../parsing/longident.cmx ../utils/misc.cmx ../typing/path.cmx \
-    ../typing/printtyp.cmx printval.cmx ../bytecomp/symtable.cmx \
-    ../typing/types.cmx loadprinter.cmi 
-main.cmo: checkpoints.cmi command_line.cmi ../utils/config.cmi \
-    debugger_config.cmi ../typing/env.cmi exec.cmi frames.cmi \
-    input_handling.cmi ../utils/misc.cmi parameters.cmi primitives.cmi \
-    program_management.cmi show_information.cmi time_travel.cmi \
-    ../otherlibs/unix/unix.cmi unix_tools.cmi 
-main.cmx: checkpoints.cmx command_line.cmx ../utils/config.cmx \
-    debugger_config.cmx ../typing/env.cmx exec.cmx frames.cmx \
-    input_handling.cmx ../utils/misc.cmx parameters.cmx primitives.cmx \
-    program_management.cmx show_information.cmx time_travel.cmx \
-    ../otherlibs/unix/unix.cmx unix_tools.cmx 
-parameters.cmo: ../utils/config.cmi envaux.cmi ../utils/misc.cmi \
-    primitives.cmi parameters.cmi 
-parameters.cmx: ../utils/config.cmx envaux.cmx ../utils/misc.cmx \
-    primitives.cmx parameters.cmi 
-parser.cmo: input_handling.cmi int64ops.cmi ../parsing/longident.cmi \
-    parser_aux.cmi primitives.cmi parser.cmi 
-parser.cmx: input_handling.cmx int64ops.cmx ../parsing/longident.cmx \
-    parser_aux.cmi primitives.cmx parser.cmi 
-pattern_matching.cmo: ../typing/ctype.cmi debugcom.cmi debugger_config.cmi \
-    ../utils/misc.cmi parser_aux.cmi ../typing/typedtree.cmi \
+lexer.cmo: primitives.cmi parser.cmi lexer.cmi 
+lexer.cmx: primitives.cmx parser.cmx lexer.cmi 
+loadprinter.cmo: ../typing/types.cmi ../bytecomp/symtable.cmi printval.cmi \
+    ../typing/printtyp.cmi ../typing/path.cmi ../utils/misc.cmi \
+    ../parsing/longident.cmi ../typing/ident.cmi ../typing/env.cmi \
+    ../otherlibs/dynlink/dynlink.cmi debugger_config.cmi ../typing/ctype.cmi \
+    ../utils/config.cmi loadprinter.cmi 
+loadprinter.cmx: ../typing/types.cmx ../bytecomp/symtable.cmx printval.cmx \
+    ../typing/printtyp.cmx ../typing/path.cmx ../utils/misc.cmx \
+    ../parsing/longident.cmx ../typing/ident.cmx ../typing/env.cmx \
+    ../otherlibs/dynlink/dynlink.cmx debugger_config.cmx ../typing/ctype.cmx \
+    ../utils/config.cmx loadprinter.cmi 
+main.cmo: unix_tools.cmi ../otherlibs/unix/unix.cmi time_travel.cmi \
+    show_information.cmi program_management.cmi primitives.cmi parameters.cmi \
+    ../utils/misc.cmi input_handling.cmi frames.cmi exec.cmi \
+    ../typing/env.cmi debugger_config.cmi ../utils/config.cmi \
+    command_line.cmi checkpoints.cmi 
+main.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx time_travel.cmx \
+    show_information.cmx program_management.cmx primitives.cmx parameters.cmx \
+    ../utils/misc.cmx input_handling.cmx frames.cmx exec.cmx \
+    ../typing/env.cmx debugger_config.cmx ../utils/config.cmx \
+    command_line.cmx checkpoints.cmx 
+parameters.cmo: primitives.cmi ../utils/misc.cmi envaux.cmi \
+    ../utils/config.cmi parameters.cmi 
+parameters.cmx: primitives.cmx ../utils/misc.cmx envaux.cmx \
+    ../utils/config.cmx parameters.cmi 
+parser.cmo: primitives.cmi parser_aux.cmi ../parsing/longident.cmi \
+    int64ops.cmi input_handling.cmi parser.cmi 
+parser.cmx: primitives.cmx parser_aux.cmi ../parsing/longident.cmx \
+    int64ops.cmx input_handling.cmx parser.cmi 
+pattern_matching.cmo: ../typing/typedtree.cmi parser_aux.cmi \
+    ../utils/misc.cmi debugger_config.cmi debugcom.cmi ../typing/ctype.cmi \
     pattern_matching.cmi 
-pattern_matching.cmx: ../typing/ctype.cmx debugcom.cmx debugger_config.cmx \
-    ../utils/misc.cmx parser_aux.cmi ../typing/typedtree.cmx \
+pattern_matching.cmx: ../typing/typedtree.cmx parser_aux.cmi \
+    ../utils/misc.cmx debugger_config.cmx debugcom.cmx ../typing/ctype.cmx \
     pattern_matching.cmi 
-pos.cmo: ../bytecomp/instruct.cmi primitives.cmi source.cmi pos.cmi 
-pos.cmx: ../bytecomp/instruct.cmx primitives.cmx source.cmx pos.cmi 
+pos.cmo: source.cmi primitives.cmi ../bytecomp/instruct.cmi pos.cmi 
+pos.cmx: source.cmx primitives.cmx ../bytecomp/instruct.cmx pos.cmi 
 primitives.cmo: ../otherlibs/unix/unix.cmi primitives.cmi 
 primitives.cmx: ../otherlibs/unix/unix.cmx primitives.cmi 
-printval.cmo: debugcom.cmi ../toplevel/genprintval.cmi ../utils/misc.cmi \
-    ../typing/oprint.cmi ../typing/outcometree.cmi parser_aux.cmi \
-    ../typing/path.cmi ../typing/printtyp.cmi ../bytecomp/symtable.cmi \
-    ../typing/types.cmi printval.cmi 
-printval.cmx: debugcom.cmx ../toplevel/genprintval.cmx ../utils/misc.cmx \
-    ../typing/oprint.cmx ../typing/outcometree.cmi parser_aux.cmi \
-    ../typing/path.cmx ../typing/printtyp.cmx ../bytecomp/symtable.cmx \
-    ../typing/types.cmx printval.cmi 
-program_loading.cmo: debugger_config.cmi input_handling.cmi ../utils/misc.cmi \
-    parameters.cmi primitives.cmi ../otherlibs/unix/unix.cmi unix_tools.cmi \
+printval.cmo: ../typing/types.cmi ../bytecomp/symtable.cmi \
+    ../typing/printtyp.cmi ../typing/path.cmi parser_aux.cmi \
+    ../typing/outcometree.cmi ../typing/oprint.cmi ../utils/misc.cmi \
+    ../toplevel/genprintval.cmi debugcom.cmi printval.cmi 
+printval.cmx: ../typing/types.cmx ../bytecomp/symtable.cmx \
+    ../typing/printtyp.cmx ../typing/path.cmx parser_aux.cmi \
+    ../typing/outcometree.cmi ../typing/oprint.cmx ../utils/misc.cmx \
+    ../toplevel/genprintval.cmx debugcom.cmx printval.cmi 
+program_loading.cmo: unix_tools.cmi ../otherlibs/unix/unix.cmi primitives.cmi \
+    parameters.cmi ../utils/misc.cmi input_handling.cmi debugger_config.cmi \
     program_loading.cmi 
-program_loading.cmx: debugger_config.cmx input_handling.cmx ../utils/misc.cmx \
-    parameters.cmx primitives.cmx ../otherlibs/unix/unix.cmx unix_tools.cmx \
+program_loading.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx primitives.cmx \
+    parameters.cmx ../utils/misc.cmx input_handling.cmx debugger_config.cmx \
     program_loading.cmi 
-program_management.cmo: breakpoints.cmi debugcom.cmi debugger_config.cmi \
-    history.cmi input_handling.cmi ../bytecomp/instruct.cmi int64ops.cmi \
-    ../utils/misc.cmi parameters.cmi primitives.cmi program_loading.cmi \
-    symbols.cmi time_travel.cmi ../otherlibs/unix/unix.cmi unix_tools.cmi \
-    program_management.cmi 
-program_management.cmx: breakpoints.cmx debugcom.cmx debugger_config.cmx \
-    history.cmx input_handling.cmx ../bytecomp/instruct.cmx int64ops.cmx \
-    ../utils/misc.cmx parameters.cmx primitives.cmx program_loading.cmx \
-    symbols.cmx time_travel.cmx ../otherlibs/unix/unix.cmx unix_tools.cmx \
-    program_management.cmi 
-show_information.cmo: breakpoints.cmi checkpoints.cmi debugcom.cmi events.cmi \
-    frames.cmi ../bytecomp/instruct.cmi ../utils/misc.cmi primitives.cmi \
-    printval.cmi show_source.cmi symbols.cmi show_information.cmi 
-show_information.cmx: breakpoints.cmx checkpoints.cmx debugcom.cmx events.cmx \
-    frames.cmx ../bytecomp/instruct.cmx ../utils/misc.cmx primitives.cmx \
-    printval.cmx show_source.cmx symbols.cmx show_information.cmi 
-show_source.cmo: debugger_config.cmi ../utils/misc.cmi parameters.cmi \
-    primitives.cmi source.cmi show_source.cmi 
-show_source.cmx: debugger_config.cmx ../utils/misc.cmx parameters.cmx \
-    primitives.cmx source.cmx show_source.cmi 
-source.cmo: ../utils/config.cmi ../utils/misc.cmi primitives.cmi source.cmi 
-source.cmx: ../utils/config.cmx ../utils/misc.cmx primitives.cmx source.cmi 
-symbols.cmo: ../bytecomp/bytesections.cmi debugcom.cmi debugger_config.cmi \
-    ../bytecomp/instruct.cmi primitives.cmi ../bytecomp/symtable.cmi \
-    symbols.cmi 
-symbols.cmx: ../bytecomp/bytesections.cmx debugcom.cmx debugger_config.cmx \
-    ../bytecomp/instruct.cmx primitives.cmx ../bytecomp/symtable.cmx \
-    symbols.cmi 
-time_travel.cmo: breakpoints.cmi checkpoints.cmi debugcom.cmi \
-    debugger_config.cmi events.cmi exec.cmi input_handling.cmi \
-    ../bytecomp/instruct.cmi int64ops.cmi ../utils/misc.cmi primitives.cmi \
-    program_loading.cmi symbols.cmi trap_barrier.cmi time_travel.cmi 
-time_travel.cmx: breakpoints.cmx checkpoints.cmx debugcom.cmx \
-    debugger_config.cmx events.cmx exec.cmx input_handling.cmx \
-    ../bytecomp/instruct.cmx int64ops.cmx ../utils/misc.cmx primitives.cmx \
-    program_loading.cmx symbols.cmx trap_barrier.cmx time_travel.cmi 
-trap_barrier.cmo: checkpoints.cmi debugcom.cmi exec.cmi trap_barrier.cmi 
-trap_barrier.cmx: checkpoints.cmx debugcom.cmx exec.cmx trap_barrier.cmi 
-unix_tools.cmo: ../utils/misc.cmi primitives.cmi ../otherlibs/unix/unix.cmi \
+program_management.cmo: unix_tools.cmi ../otherlibs/unix/unix.cmi \
+    time_travel.cmi symbols.cmi program_loading.cmi primitives.cmi \
+    parameters.cmi ../utils/misc.cmi int64ops.cmi ../bytecomp/instruct.cmi \
+    input_handling.cmi history.cmi debugger_config.cmi debugcom.cmi \
+    breakpoints.cmi program_management.cmi 
+program_management.cmx: unix_tools.cmx ../otherlibs/unix/unix.cmx \
+    time_travel.cmx symbols.cmx program_loading.cmx primitives.cmx \
+    parameters.cmx ../utils/misc.cmx int64ops.cmx ../bytecomp/instruct.cmx \
+    input_handling.cmx history.cmx debugger_config.cmx debugcom.cmx \
+    breakpoints.cmx program_management.cmi 
+show_information.cmo: symbols.cmi show_source.cmi printval.cmi primitives.cmi \
+    ../utils/misc.cmi ../bytecomp/instruct.cmi frames.cmi events.cmi \
+    debugcom.cmi checkpoints.cmi breakpoints.cmi show_information.cmi 
+show_information.cmx: symbols.cmx show_source.cmx printval.cmx primitives.cmx \
+    ../utils/misc.cmx ../bytecomp/instruct.cmx frames.cmx events.cmx \
+    debugcom.cmx checkpoints.cmx breakpoints.cmx show_information.cmi 
+show_source.cmo: source.cmi primitives.cmi parameters.cmi ../utils/misc.cmi \
+    debugger_config.cmi show_source.cmi 
+show_source.cmx: source.cmx primitives.cmx parameters.cmx ../utils/misc.cmx \
+    debugger_config.cmx show_source.cmi 
+source.cmo: primitives.cmi ../utils/misc.cmi ../utils/config.cmi source.cmi 
+source.cmx: primitives.cmx ../utils/misc.cmx ../utils/config.cmx source.cmi 
+symbols.cmo: ../bytecomp/symtable.cmi primitives.cmi ../bytecomp/instruct.cmi \
+    debugger_config.cmi debugcom.cmi ../bytecomp/bytesections.cmi symbols.cmi 
+symbols.cmx: ../bytecomp/symtable.cmx primitives.cmx ../bytecomp/instruct.cmx \
+    debugger_config.cmx debugcom.cmx ../bytecomp/bytesections.cmx symbols.cmi 
+time_travel.cmo: trap_barrier.cmi symbols.cmi program_loading.cmi \
+    primitives.cmi ../utils/misc.cmi int64ops.cmi ../bytecomp/instruct.cmi \
+    input_handling.cmi exec.cmi events.cmi debugger_config.cmi debugcom.cmi \
+    checkpoints.cmi breakpoints.cmi time_travel.cmi 
+time_travel.cmx: trap_barrier.cmx symbols.cmx program_loading.cmx \
+    primitives.cmx ../utils/misc.cmx int64ops.cmx ../bytecomp/instruct.cmx \
+    input_handling.cmx exec.cmx events.cmx debugger_config.cmx debugcom.cmx \
+    checkpoints.cmx breakpoints.cmx time_travel.cmi 
+trap_barrier.cmo: exec.cmi debugcom.cmi checkpoints.cmi trap_barrier.cmi 
+trap_barrier.cmx: exec.cmx debugcom.cmx checkpoints.cmx trap_barrier.cmi 
+unix_tools.cmo: ../otherlibs/unix/unix.cmi primitives.cmi ../utils/misc.cmi \
     unix_tools.cmi 
-unix_tools.cmx: ../utils/misc.cmx primitives.cmx ../otherlibs/unix/unix.cmx \
+unix_tools.cmx: ../otherlibs/unix/unix.cmx primitives.cmx ../utils/misc.cmx \
     unix_tools.cmi 

diff --git a/debugger/CVS/Entries b/debugger/CVS/Entries
new file mode 100644 (file)
index 0000000..35af822
--- /dev/null
+++ b/debugger/CVS/Entries
@@ -0,0 +1,65 @@
+/.cvsignore/1.1/Fri Mar 21 07:10:20 1997//Tocaml3083
+/.depend/1.30.2.2/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.29/Sun Feb 22 15:07:51 2004//Tocaml3083
+/breakpoints.ml/1.12/Fri Nov 21 16:10:56 2003//Tocaml3083
+/breakpoints.mli/1.2/Wed Nov 17 18:57:22 1999//Tocaml3083
+/checkpoints.ml/1.4/Tue Oct 29 17:53:23 2002//Tocaml3083
+/checkpoints.mli/1.4/Tue Oct 29 17:53:23 2002//Tocaml3083
+/command_line.ml/1.21/Fri Nov 21 16:10:56 2003//Tocaml3083
+/command_line.mli/1.4/Tue Mar  7 18:22:14 2000//Tocaml3083
+/debugcom.ml/1.12/Tue Oct 29 17:53:23 2002//Tocaml3083
+/debugcom.mli/1.8/Tue Oct 29 17:53:23 2002//Tocaml3083
+/debugger_config.ml/1.10/Sun Nov 17 16:42:10 2002//Tocaml3083
+/debugger_config.mli/1.5/Sun Nov 17 16:42:10 2002//Tocaml3083
+/envaux.ml/1.7/Mon Mar  6 22:11:17 2000//Tocaml3083
+/envaux.mli/1.5/Mon Mar  6 22:11:20 2000//Tocaml3083
+/eval.ml/1.28/Wed Jul  2 09:14:30 2003//Tocaml3083
+/eval.mli/1.6/Mon Mar  6 22:11:21 2000//Tocaml3083
+/events.ml/1.5/Sat Nov  2 22:36:42 2002//Tocaml3083
+/events.mli/1.3/Wed Nov 17 18:57:24 1999//Tocaml3083
+/exec.ml/1.4/Wed Nov 17 18:57:24 1999//Tocaml3083
+/exec.mli/1.4/Wed Nov 17 18:57:24 1999//Tocaml3083
+/frames.ml/1.9/Sat Nov  2 22:36:42 2002//Tocaml3083
+/frames.mli/1.3/Wed Nov 17 18:57:24 1999//Tocaml3083
+/history.ml/1.5/Tue Oct 29 17:53:24 2002//Tocaml3083
+/history.mli/1.4/Tue Oct 29 17:53:24 2002//Tocaml3083
+/input_handling.ml/1.4/Wed Nov 17 18:57:25 1999//Tocaml3083
+/input_handling.mli/1.2/Wed Nov 17 18:57:25 1999//Tocaml3083
+/int64ops.ml/1.1/Tue Oct 29 17:53:24 2002//Tocaml3083
+/int64ops.mli/1.1/Tue Oct 29 17:53:24 2002//Tocaml3083
+/lexer.mli/1.1/Sun Jun 13 12:46:11 2004//Tocaml3083
+/lexer.mll/1.8/Fri Jan  3 15:39:54 2003//Tocaml3083
+/loadprinter.ml/1.18/Thu Jul 17 13:55:37 2003//Tocaml3083
+/loadprinter.mli/1.4/Tue Mar  7 18:22:15 2000//Tocaml3083
+/main.ml/1.15/Thu Dec  4 12:32:04 2003//Tocaml3083
+/parameters.ml/1.3/Thu Feb 14 15:17:10 2002//Tocaml3083
+/parameters.mli/1.2/Wed Nov 17 18:57:26 1999//Tocaml3083
+/parser.mly/1.7/Tue Oct 29 17:53:24 2002//Tocaml3083
+/parser_aux.mli/1.4/Wed Nov 17 18:57:26 1999//Tocaml3083
+/pattern_matching.ml/1.4/Thu Dec 28 13:03:41 2000//Tocaml3083
+/pattern_matching.mli/1.2/Wed Nov 17 18:57:26 1999//Tocaml3083
+/pos.ml/1.1/Fri Nov 21 16:10:56 2003//Tocaml3083
+/pos.mli/1.1/Fri Nov 21 16:10:57 2003//Tocaml3083
+/primitives.ml/1.6/Tue Oct 29 17:53:24 2002//Tocaml3083
+/primitives.mli/1.2/Wed Nov 17 18:57:26 1999//Tocaml3083
+/printval.ml/1.21/Wed Feb 13 11:09:17 2002//Tocaml3083
+/printval.mli/1.10/Tue Jul  3 11:04:09 2001//Tocaml3083
+/program_loading.ml/1.6/Wed Nov 17 18:57:27 1999//Tocaml3083
+/program_loading.mli/1.3/Wed Nov 17 18:57:27 1999//Tocaml3083
+/program_management.ml/1.11/Sat Nov  2 22:36:42 2002//Tocaml3083
+/program_management.mli/1.2/Wed Nov 17 18:57:27 1999//Tocaml3083
+/show_information.ml/1.12/Sat Nov  2 22:36:44 2002//Tocaml3083
+/show_information.mli/1.3/Mon Mar  6 22:11:25 2000//Tocaml3083
+/show_source.ml/1.12/Tue Mar  7 18:22:18 2000//Tocaml3083
+/show_source.mli/1.3/Wed Nov 17 18:57:28 1999//Tocaml3083
+/source.ml/1.7/Fri Jun  7 07:35:38 2002//Tocaml3083
+/source.mli/1.2/Wed Nov 17 18:57:28 1999//Tocaml3083
+/symbols.ml/1.17/Sat Nov  2 22:36:45 2002//Tocaml3083
+/symbols.mli/1.6/Wed Nov 17 18:57:29 1999//Tocaml3083
+/time_travel.ml/1.17/Mon Jun 21 08:39:32 2004//Tocaml3083
+/time_travel.mli/1.5/Tue Oct 29 17:53:24 2002//Tocaml3083
+/trap_barrier.ml/1.3/Wed Nov 17 18:57:29 1999//Tocaml3083
+/trap_barrier.mli/1.2/Wed Nov 17 18:57:29 1999//Tocaml3083
+/unix_tools.ml/1.8/Sat Nov  2 22:36:45 2002//Tocaml3083
+/unix_tools.mli/1.4/Sat Nov  2 22:36:45 2002//Tocaml3083
+D

diff --git a/debugger/CVS/Repository b/debugger/CVS/Repository
new file mode 100644 (file)
index 0000000..7d36cdb
--- /dev/null
+++ b/debugger/CVS/Repository
@@ -0,0 +1 @@
+csl/debugger

diff --git a/debugger/CVS/Root b/debugger/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/debugger/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/debugger/CVS/Tag b/debugger/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/debugger/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/driver/CVS/Entries b/driver/CVS/Entries
new file mode 100644 (file)
index 0000000..10f1f8b
--- /dev/null
+++ b/driver/CVS/Entries
@@ -0,0 +1,18 @@
+/compile.ml/1.54/Sun Jun 13 12:46:41 2004//Tocaml3083
+/compile.mli/1.8/Sun Jun 13 12:46:41 2004//Tocaml3083
+/errors.ml/1.25/Thu Jun 19 15:53:49 2003//Tocaml3083
+/errors.mli/1.5/Mon Mar  6 22:11:31 2000//Tocaml3083
+/main.ml/1.67/Sun Jun 13 12:46:41 2004//Tocaml3083
+/main.mli/1.1/Fri Jan  7 16:03:04 2000//Tocaml3083
+/main_args.ml/1.42/Thu Jul 17 08:38:27 2003//Tocaml3083
+/main_args.mli/1.25/Thu Jul 17 08:38:27 2003//Tocaml3083
+/ocamlcomp.sh.in/1.2/Sat Jun  8 03:27:50 2002//Tocaml3083
+/optcompile.ml/1.48/Sun Jun 13 12:46:41 2004//Tocaml3083
+/optcompile.mli/1.8/Sun Jun 13 12:46:41 2004//Tocaml3083
+/opterrors.ml/1.18/Thu Jun 19 15:53:49 2003//Tocaml3083
+/opterrors.mli/1.5/Tue Mar  7 05:02:32 2000//Tocaml3083
+/optmain.ml/1.81/Sun Jun 13 12:46:41 2004//Tocaml3083
+/optmain.mli/1.1/Fri Jan  7 16:03:04 2000//Tocaml3083
+/pparse.ml/1.3/Wed Jun 16 16:58:46 2004//Tocaml3083
+/pparse.mli/1.1/Fri Feb  8 10:14:31 2002//Tocaml3083
+D

diff --git a/driver/CVS/Repository b/driver/CVS/Repository
new file mode 100644 (file)
index 0000000..476986f
--- /dev/null
+++ b/driver/CVS/Repository
@@ -0,0 +1 @@
+csl/driver

diff --git a/driver/CVS/Root b/driver/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/driver/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/driver/CVS/Tag b/driver/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/driver/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/emacs/CVS/Entries b/emacs/CVS/Entries
new file mode 100644 (file)
index 0000000..3036c2a
--- /dev/null
+++ b/emacs/CVS/Entries
@@ -0,0 +1,17 @@
+/.cvsignore/1.2/Wed Jan  9 20:38:33 2002//Tocaml3083
+/COPYING/1.1.2.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/Makefile/1.16.4.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/README/1.12/Mon Aug  5 02:05:42 2002//Tocaml3083
+/README.itz/1.2/Wed Apr  5 18:30:13 2000//Tocaml3083
+/caml-compat.el/1.2.18.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/caml-emacs.el/1.6.6.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/caml-font.el/1.18.2.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/caml-help.el/1.16.4.1/Mon Aug  9 16:09:33 2004/-kk/Tocaml3083
+/caml-hilit.el/1.8.4.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/caml-types.el/1.29.6.2/Mon Nov 15 12:50:54 2004//Tocaml3083
+/caml-xemacs.el/1.5.6.2/Tue Nov  2 10:21:03 2004//Tocaml3083
+/caml.el/1.36.4.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/camldebug.el/1.8.4.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/inf-caml.el/1.10.8.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+/ocamltags.in/1.5.18.1/Mon Aug  9 16:09:33 2004//Tocaml3083
+D

diff --git a/emacs/CVS/Repository b/emacs/CVS/Repository
new file mode 100644 (file)
index 0000000..4c35e1f
--- /dev/null
+++ b/emacs/CVS/Repository
@@ -0,0 +1 @@
+csl/emacs

diff --git a/emacs/CVS/Root b/emacs/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/emacs/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/emacs/CVS/Tag b/emacs/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/emacs/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/lex/.depend b/lex/.depend
index f90d6dc6ebeb874a70142dcc54383b66ddc7449c..df3964912aea0a5d6a634c352d8e1ece2478e7cc 100644 (file)
--- a/lex/.depend
+++ b/lex/.depend
@@ -1,31 +1,31 @@
-common.cmi: lexgen.cmi syntax.cmi 
+common.cmi: syntax.cmi lexgen.cmi 
 compact.cmi: lexgen.cmi 
 lexer.cmi: parser.cmi 
 lexgen.cmi: syntax.cmi 
-output.cmi: common.cmi compact.cmi lexgen.cmi syntax.cmi 
-outputbis.cmi: common.cmi lexgen.cmi syntax.cmi 
+output.cmi: syntax.cmi lexgen.cmi compact.cmi common.cmi 
+outputbis.cmi: syntax.cmi lexgen.cmi common.cmi 
 parser.cmi: syntax.cmi 
 syntax.cmi: cset.cmi 
-common.cmo: lexgen.cmi syntax.cmi common.cmi 
-common.cmx: lexgen.cmx syntax.cmx common.cmi 
-compact.cmo: lexgen.cmi table.cmi compact.cmi 
-compact.cmx: lexgen.cmx table.cmx compact.cmi 
+common.cmo: syntax.cmi lexgen.cmi common.cmi 
+common.cmx: syntax.cmx lexgen.cmx common.cmi 
+compact.cmo: table.cmi lexgen.cmi compact.cmi 
+compact.cmx: table.cmx lexgen.cmx compact.cmi 
 cset.cmo: cset.cmi 
 cset.cmx: cset.cmi 
-lexer.cmo: parser.cmi syntax.cmi lexer.cmi 
-lexer.cmx: parser.cmx syntax.cmx lexer.cmi 
-lexgen.cmo: cset.cmi syntax.cmi table.cmi lexgen.cmi 
-lexgen.cmx: cset.cmx syntax.cmx table.cmx lexgen.cmi 
-main.cmo: common.cmi compact.cmi cset.cmi lexer.cmi lexgen.cmi output.cmi \
-    outputbis.cmi parser.cmi syntax.cmi 
-main.cmx: common.cmx compact.cmx cset.cmx lexer.cmx lexgen.cmx output.cmx \
-    outputbis.cmx parser.cmx syntax.cmx 
-output.cmo: common.cmi compact.cmi lexgen.cmi syntax.cmi output.cmi 
-output.cmx: common.cmx compact.cmx lexgen.cmx syntax.cmx output.cmi 
-outputbis.cmo: common.cmi lexgen.cmi syntax.cmi outputbis.cmi 
-outputbis.cmx: common.cmx lexgen.cmx syntax.cmx outputbis.cmi 
-parser.cmo: cset.cmi syntax.cmi parser.cmi 
-parser.cmx: cset.cmx syntax.cmx parser.cmi 
+lexer.cmo: syntax.cmi parser.cmi lexer.cmi 
+lexer.cmx: syntax.cmx parser.cmx lexer.cmi 
+lexgen.cmo: table.cmi syntax.cmi cset.cmi lexgen.cmi 
+lexgen.cmx: table.cmx syntax.cmx cset.cmx lexgen.cmi 
+main.cmo: syntax.cmi parser.cmi outputbis.cmi output.cmi lexgen.cmi lexer.cmi \
+    cset.cmi compact.cmi common.cmi 
+main.cmx: syntax.cmx parser.cmx outputbis.cmx output.cmx lexgen.cmx lexer.cmx \
+    cset.cmx compact.cmx common.cmx 
+output.cmo: syntax.cmi lexgen.cmi compact.cmi common.cmi output.cmi 
+output.cmx: syntax.cmx lexgen.cmx compact.cmx common.cmx output.cmi 
+outputbis.cmo: syntax.cmi lexgen.cmi common.cmi outputbis.cmi 
+outputbis.cmx: syntax.cmx lexgen.cmx common.cmx outputbis.cmi 
+parser.cmo: syntax.cmi cset.cmi parser.cmi 
+parser.cmx: syntax.cmx cset.cmx parser.cmi 
 syntax.cmo: cset.cmi syntax.cmi 
 syntax.cmx: cset.cmx syntax.cmi 
 table.cmo: table.cmi 

diff --git a/lex/CVS/Entries b/lex/CVS/Entries
new file mode 100644 (file)
index 0000000..f7604e6
--- /dev/null
+++ b/lex/CVS/Entries
@@ -0,0 +1,25 @@
+/.cvsignore/1.5/Mon Apr 22 10:06:01 2002//Tocaml3083
+/.depend/1.13.4.2/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.17/Fri Nov  1 15:31:11 2002//Tocaml3083
+/Makefile.nt/1.9/Mon Jan  6 14:57:22 2003//Tocaml3083
+/common.ml/1.7/Fri Aug 29 17:33:44 2003//Tocaml3083
+/common.mli/1.4/Fri Aug 29 17:33:44 2003//Tocaml3083
+/compact.ml/1.7/Mon Oct 28 16:46:49 2002//Tocaml3083
+/compact.mli/1.4/Mon Oct 28 16:46:49 2002//Tocaml3083
+/cset.ml/1.3/Thu Apr 29 11:12:49 2004//Tocaml3083
+/cset.mli/1.3/Thu Apr 29 11:12:49 2004//Tocaml3083
+/lexer.mli/1.6/Wed Apr 21 23:26:05 2004//Tocaml3083
+/lexer.mll/1.21/Thu Apr 29 11:12:49 2004//Tocaml3083
+/lexgen.ml/1.17/Tue Mar 23 16:57:24 2004//Tocaml3083
+/lexgen.mli/1.5/Mon Oct 28 16:46:49 2002//Tocaml3083
+/main.ml/1.21.2.1/Thu Jul 22 11:00:35 2004//Tocaml3083
+/output.ml/1.25/Thu Feb 12 17:29:04 2004//Tocaml3083
+/output.mli/1.8/Mon Dec  9 10:44:46 2002//Tocaml3083
+/outputbis.ml/1.5/Sat Jul 26 21:06:21 2003//Tocaml3083
+/outputbis.mli/1.3/Mon Dec  9 10:44:46 2002//Tocaml3083
+/parser.mly/1.20/Thu Apr 29 11:12:49 2004//Tocaml3083
+/syntax.ml/1.8/Mon Dec  9 10:44:46 2002//Tocaml3083
+/syntax.mli/1.8/Mon Dec  9 10:44:46 2002//Tocaml3083
+/table.ml/1.1/Mon Oct 28 16:46:50 2002//Tocaml3083
+/table.mli/1.1/Mon Oct 28 16:46:50 2002//Tocaml3083
+D

diff --git a/lex/CVS/Repository b/lex/CVS/Repository
new file mode 100644 (file)
index 0000000..86f12e8
--- /dev/null
+++ b/lex/CVS/Repository
@@ -0,0 +1 @@
+csl/lex

diff --git a/lex/CVS/Root b/lex/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/lex/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/lex/CVS/Tag b/lex/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/lex/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/man/CVS/Entries b/man/CVS/Entries
new file mode 100644 (file)
index 0000000..02e50c7
--- /dev/null
+++ b/man/CVS/Entries
@@ -0,0 +1,15 @@
+/Makefile/1.3/Wed Apr 24 09:09:35 2002//Tocaml3083
+/ocaml.help/1.2/Mon Nov 15 16:51:04 1999//Tocaml3083
+/ocaml.m/1.6/Fri Feb  8 10:16:10 2002//Tocaml3083
+/ocamlc.m/1.6.6.2/Thu Jun 24 14:53:42 2004//Tocaml3083
+/ocamlcp.m/1.2/Fri May 10 13:27:19 1996//Tocaml3083
+/ocamldebug.m/1.1/Tue Mar  6 09:59:18 2001//Tocaml3083
+/ocamldep.m/1.3/Fri Jul  6 17:08:10 2001//Tocaml3083
+/ocamldoc.m/1.1.6.2/Fri Jul  9 10:43:11 2004//Tocaml3083
+/ocamllex.m/1.3/Thu Jul 24 08:57:02 2003//Tocaml3083
+/ocamlmktop.m/1.1/Thu Feb 25 14:25:54 1999//Tocaml3083
+/ocamlopt.m/1.7.6.1/Thu Jun 24 13:55:21 2004//Tocaml3083
+/ocamlprof.m/1.2.18.1/Fri Jul  2 09:37:17 2004//Tocaml3083
+/ocamlrun.m/1.4/Thu Apr 15 16:16:55 2004//Tocaml3083
+/ocamlyacc.m/1.2/Fri May 10 13:27:26 1996//Tocaml3083
+D

diff --git a/man/CVS/Repository b/man/CVS/Repository
new file mode 100644 (file)
index 0000000..f3ea2e7
--- /dev/null
+++ b/man/CVS/Repository
@@ -0,0 +1 @@
+csl/man

diff --git a/man/CVS/Root b/man/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/man/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/man/CVS/Tag b/man/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/man/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/ocamldoc/.depend b/ocamldoc/.depend
index d8c49f4273e8e567341d0589343d4f958a8756a0..9d1be2e9242f97531f57c3f1421d75187d3247c4 100644 (file)
--- a/ocamldoc/.depend
+++ b/ocamldoc/.depend
@@ -1,234 +1,231 @@
-odoc.cmo: ../utils/clflags.cmo ../utils/config.cmi ../utils/misc.cmi \
-    odoc_analyse.cmi odoc_args.cmi odoc_config.cmi odoc_dot.cmo \
-    odoc_global.cmi odoc_html.cmo odoc_info.cmi odoc_latex.cmo odoc_man.cmo \
-    odoc_messages.cmo odoc_texi.cmo ../typing/typedtree.cmi 
-odoc.cmx: ../utils/clflags.cmx ../utils/config.cmx ../utils/misc.cmx \
-    odoc_analyse.cmx odoc_args.cmx odoc_config.cmx odoc_dot.cmx \
-    odoc_global.cmx odoc_html.cmx odoc_info.cmx odoc_latex.cmx odoc_man.cmx \
-    odoc_messages.cmx odoc_texi.cmx ../typing/typedtree.cmx 
-odoc_analyse.cmo: ../utils/ccomp.cmi ../utils/clflags.cmo ../utils/config.cmi \
-    ../typing/ctype.cmi ../typing/env.cmi ../typing/includemod.cmi \
-    ../parsing/lexer.cmi ../parsing/location.cmi ../utils/misc.cmi \
-    odoc_args.cmi odoc_ast.cmi odoc_class.cmo odoc_comments.cmi \
-    odoc_cross.cmi odoc_dep.cmo odoc_global.cmi odoc_merge.cmi \
-    odoc_messages.cmo odoc_misc.cmi odoc_module.cmo odoc_sig.cmi \
-    odoc_types.cmi ../parsing/parse.cmi ../parsing/syntaxerr.cmi \
-    ../bytecomp/translclass.cmi ../bytecomp/translcore.cmi \
-    ../typing/typeclass.cmi ../typing/typecore.cmi ../typing/typedecl.cmi \
-    ../typing/typedtree.cmi ../typing/typemod.cmi ../typing/typetexp.cmi \
-    ../utils/warnings.cmi odoc_analyse.cmi 
-odoc_analyse.cmx: ../utils/ccomp.cmx ../utils/clflags.cmx ../utils/config.cmx \
-    ../typing/ctype.cmx ../typing/env.cmx ../typing/includemod.cmx \
-    ../parsing/lexer.cmx ../parsing/location.cmx ../utils/misc.cmx \
-    odoc_args.cmx odoc_ast.cmx odoc_class.cmx odoc_comments.cmx \
-    odoc_cross.cmx odoc_dep.cmx odoc_global.cmx odoc_merge.cmx \
-    odoc_messages.cmx odoc_misc.cmx odoc_module.cmx odoc_sig.cmx \
-    odoc_types.cmx ../parsing/parse.cmx ../parsing/syntaxerr.cmx \
-    ../bytecomp/translclass.cmx ../bytecomp/translcore.cmx \
-    ../typing/typeclass.cmx ../typing/typecore.cmx ../typing/typedecl.cmx \
-    ../typing/typedtree.cmx ../typing/typemod.cmx ../typing/typetexp.cmx \
-    ../utils/warnings.cmx odoc_analyse.cmi 
-odoc_args.cmo: ../utils/clflags.cmo ../utils/config.cmi ../utils/misc.cmi \
-    odoc_config.cmi odoc_global.cmi odoc_messages.cmo odoc_module.cmo \
-    odoc_types.cmi odoc_args.cmi 
-odoc_args.cmx: ../utils/clflags.cmx ../utils/config.cmx ../utils/misc.cmx \
-    odoc_config.cmx odoc_global.cmx odoc_messages.cmx odoc_module.cmx \
-    odoc_types.cmx odoc_args.cmi 
-odoc_ast.cmo: ../parsing/asttypes.cmi ../parsing/location.cmi \
-    ../utils/misc.cmi odoc_args.cmi odoc_class.cmo odoc_env.cmi \
-    odoc_exception.cmo odoc_global.cmi odoc_messages.cmo odoc_module.cmo \
-    odoc_name.cmi odoc_parameter.cmo odoc_sig.cmi odoc_type.cmo \
-    odoc_types.cmi odoc_value.cmo ../parsing/parsetree.cmi ../typing/path.cmi \
-    ../typing/predef.cmi ../typing/typedtree.cmi ../typing/types.cmi \
-    odoc_ast.cmi 
-odoc_ast.cmx: ../parsing/asttypes.cmi ../parsing/location.cmx \
-    ../utils/misc.cmx odoc_args.cmx odoc_class.cmx odoc_env.cmx \
-    odoc_exception.cmx odoc_global.cmx odoc_messages.cmx odoc_module.cmx \
-    odoc_name.cmx odoc_parameter.cmx odoc_sig.cmx odoc_type.cmx \
-    odoc_types.cmx odoc_value.cmx ../parsing/parsetree.cmi ../typing/path.cmx \
-    ../typing/predef.cmx ../typing/typedtree.cmx ../typing/types.cmx \
-    odoc_ast.cmi 
-odoc_class.cmo: odoc_name.cmi odoc_parameter.cmo odoc_types.cmi \
-    odoc_value.cmo ../typing/types.cmi 
-odoc_class.cmx: odoc_name.cmx odoc_parameter.cmx odoc_types.cmx \
-    odoc_value.cmx ../typing/types.cmx 
-odoc_comments.cmo: odoc_comments_global.cmi odoc_global.cmi odoc_lexer.cmo \
-    odoc_messages.cmo odoc_parser.cmi odoc_see_lexer.cmo odoc_text.cmi \
-    odoc_types.cmi odoc_comments.cmi 
-odoc_comments.cmx: odoc_comments_global.cmx odoc_global.cmx odoc_lexer.cmx \
-    odoc_messages.cmx odoc_parser.cmx odoc_see_lexer.cmx odoc_text.cmx \
-    odoc_types.cmx odoc_comments.cmi 
+odoc.cmo: ../typing/typedtree.cmi odoc_texi.cmo odoc_messages.cmo \
+    odoc_man.cmo odoc_latex.cmo odoc_info.cmi odoc_html.cmo odoc_global.cmi \
+    odoc_dot.cmo odoc_config.cmi odoc_args.cmi odoc_analyse.cmi \
+    ../utils/misc.cmi ../utils/config.cmi ../utils/clflags.cmo 
+odoc.cmx: ../typing/typedtree.cmx odoc_texi.cmx odoc_messages.cmx \
+    odoc_man.cmx odoc_latex.cmx odoc_info.cmx odoc_html.cmx odoc_global.cmx \
+    odoc_dot.cmx odoc_config.cmx odoc_args.cmx odoc_analyse.cmx \
+    ../utils/misc.cmx ../utils/config.cmx ../utils/clflags.cmx 
+odoc_analyse.cmo: ../utils/warnings.cmi ../typing/typetexp.cmi \
+    ../typing/typemod.cmi ../typing/typedtree.cmi ../typing/typedecl.cmi \
+    ../typing/typecore.cmi ../typing/typeclass.cmi ../bytecomp/translcore.cmi \
+    ../bytecomp/translclass.cmi ../parsing/syntaxerr.cmi ../parsing/parse.cmi \
+    odoc_types.cmi odoc_sig.cmi odoc_module.cmo odoc_misc.cmi \
+    odoc_messages.cmo odoc_merge.cmi odoc_global.cmi odoc_dep.cmo \
+    odoc_cross.cmi odoc_comments.cmi odoc_class.cmo odoc_ast.cmi \
+    odoc_args.cmi ../utils/misc.cmi ../parsing/location.cmi \
+    ../parsing/lexer.cmi ../typing/includemod.cmi ../typing/env.cmi \
+    ../typing/ctype.cmi ../utils/config.cmi ../utils/clflags.cmo \
+    ../utils/ccomp.cmi odoc_analyse.cmi 
+odoc_analyse.cmx: ../utils/warnings.cmx ../typing/typetexp.cmx \
+    ../typing/typemod.cmx ../typing/typedtree.cmx ../typing/typedecl.cmx \
+    ../typing/typecore.cmx ../typing/typeclass.cmx ../bytecomp/translcore.cmx \
+    ../bytecomp/translclass.cmx ../parsing/syntaxerr.cmx ../parsing/parse.cmx \
+    odoc_types.cmx odoc_sig.cmx odoc_module.cmx odoc_misc.cmx \
+    odoc_messages.cmx odoc_merge.cmx odoc_global.cmx odoc_dep.cmx \
+    odoc_cross.cmx odoc_comments.cmx odoc_class.cmx odoc_ast.cmx \
+    odoc_args.cmx ../utils/misc.cmx ../parsing/location.cmx \
+    ../parsing/lexer.cmx ../typing/includemod.cmx ../typing/env.cmx \
+    ../typing/ctype.cmx ../utils/config.cmx ../utils/clflags.cmx \
+    ../utils/ccomp.cmx odoc_analyse.cmi 
+odoc_args.cmo: odoc_types.cmi odoc_module.cmo odoc_messages.cmo \
+    odoc_global.cmi odoc_config.cmi ../utils/misc.cmi ../utils/config.cmi \
+    ../utils/clflags.cmo odoc_args.cmi 
+odoc_args.cmx: odoc_types.cmx odoc_module.cmx odoc_messages.cmx \
+    odoc_global.cmx odoc_config.cmx ../utils/misc.cmx ../utils/config.cmx \
+    ../utils/clflags.cmx odoc_args.cmi 
+odoc_ast.cmo: ../typing/types.cmi ../typing/typedtree.cmi \
+    ../typing/predef.cmi ../typing/path.cmi ../parsing/parsetree.cmi \
+    odoc_value.cmo odoc_types.cmi odoc_type.cmo odoc_sig.cmi \
+    odoc_parameter.cmo odoc_name.cmi odoc_module.cmo odoc_messages.cmo \
+    odoc_global.cmi odoc_exception.cmo odoc_env.cmi odoc_class.cmo \
+    odoc_args.cmi ../utils/misc.cmi ../parsing/location.cmi \
+    ../parsing/asttypes.cmi odoc_ast.cmi 
+odoc_ast.cmx: ../typing/types.cmx ../typing/typedtree.cmx \
+    ../typing/predef.cmx ../typing/path.cmx ../parsing/parsetree.cmi \
+    odoc_value.cmx odoc_types.cmx odoc_type.cmx odoc_sig.cmx \
+    odoc_parameter.cmx odoc_name.cmx odoc_module.cmx odoc_messages.cmx \
+    odoc_global.cmx odoc_exception.cmx odoc_env.cmx odoc_class.cmx \
+    odoc_args.cmx ../utils/misc.cmx ../parsing/location.cmx \
+    ../parsing/asttypes.cmi odoc_ast.cmi 
+odoc_class.cmo: ../typing/types.cmi odoc_value.cmo odoc_types.cmi \
+    odoc_parameter.cmo odoc_name.cmi 
+odoc_class.cmx: ../typing/types.cmx odoc_value.cmx odoc_types.cmx \
+    odoc_parameter.cmx odoc_name.cmx 
+odoc_comments.cmo: odoc_types.cmi odoc_text.cmi odoc_see_lexer.cmo \
+    odoc_parser.cmi odoc_messages.cmo odoc_lexer.cmo odoc_global.cmi \
+    odoc_comments_global.cmi odoc_comments.cmi 
+odoc_comments.cmx: odoc_types.cmx odoc_text.cmx odoc_see_lexer.cmx \
+    odoc_parser.cmx odoc_messages.cmx odoc_lexer.cmx odoc_global.cmx \
+    odoc_comments_global.cmx odoc_comments.cmi 
 odoc_comments_global.cmo: odoc_comments_global.cmi 
 odoc_comments_global.cmx: odoc_comments_global.cmi 
 odoc_config.cmo: ../utils/config.cmi odoc_config.cmi 
 odoc_config.cmx: ../utils/config.cmx odoc_config.cmi 
-odoc_cross.cmo: odoc_class.cmo odoc_exception.cmo odoc_messages.cmo \
-    odoc_misc.cmi odoc_module.cmo odoc_name.cmi odoc_parameter.cmo \
-    odoc_scan.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmi odoc_value.cmo \
+odoc_cross.cmo: odoc_value.cmo odoc_types.cmi odoc_type.cmo odoc_search.cmi \
+    odoc_scan.cmo odoc_parameter.cmo odoc_name.cmi odoc_module.cmo \
+    odoc_misc.cmi odoc_messages.cmo odoc_exception.cmo odoc_class.cmo \
     odoc_cross.cmi 
-odoc_cross.cmx: odoc_class.cmx odoc_exception.cmx odoc_messages.cmx \
-    odoc_misc.cmx odoc_module.cmx odoc_name.cmx odoc_parameter.cmx \
-    odoc_scan.cmx odoc_search.cmx odoc_type.cmx odoc_types.cmx odoc_value.cmx \
+odoc_cross.cmx: odoc_value.cmx odoc_types.cmx odoc_type.cmx odoc_search.cmx \
+    odoc_scan.cmx odoc_parameter.cmx odoc_name.cmx odoc_module.cmx \
+    odoc_misc.cmx odoc_messages.cmx odoc_exception.cmx odoc_class.cmx \
     odoc_cross.cmi 
 odoc_dag2html.cmo: odoc_info.cmi odoc_dag2html.cmi 
 odoc_dag2html.cmx: odoc_info.cmx odoc_dag2html.cmi 
-odoc_dep.cmo: ../tools/depend.cmi odoc_module.cmo odoc_print.cmi \
-    odoc_type.cmo ../parsing/parsetree.cmi 
-odoc_dep.cmx: ../tools/depend.cmx odoc_module.cmx odoc_print.cmx \
-    odoc_type.cmx ../parsing/parsetree.cmi 
+odoc_dep.cmo: ../parsing/parsetree.cmi odoc_type.cmo odoc_print.cmi \
+    odoc_module.cmo ../tools/depend.cmi 
+odoc_dep.cmx: ../parsing/parsetree.cmi odoc_type.cmx odoc_print.cmx \
+    odoc_module.cmx ../tools/depend.cmx 
 odoc_dot.cmo: odoc_info.cmi 
 odoc_dot.cmx: odoc_info.cmx 
-odoc_env.cmo: ../typing/btype.cmi odoc_name.cmi ../typing/path.cmi \
-    ../typing/predef.cmi ../typing/printtyp.cmi ../typing/types.cmi \
-    odoc_env.cmi 
-odoc_env.cmx: ../typing/btype.cmx odoc_name.cmx ../typing/path.cmx \
-    ../typing/predef.cmx ../typing/printtyp.cmx ../typing/types.cmx \
-    odoc_env.cmi 
-odoc_exception.cmo: odoc_name.cmi odoc_types.cmi ../typing/types.cmi 
-odoc_exception.cmx: odoc_name.cmx odoc_types.cmx ../typing/types.cmx 
+odoc_env.cmo: ../typing/types.cmi ../typing/printtyp.cmi ../typing/predef.cmi \
+    ../typing/path.cmi odoc_name.cmi ../typing/btype.cmi odoc_env.cmi 
+odoc_env.cmx: ../typing/types.cmx ../typing/printtyp.cmx ../typing/predef.cmx \
+    ../typing/path.cmx odoc_name.cmx ../typing/btype.cmx odoc_env.cmi 
+odoc_exception.cmo: ../typing/types.cmi odoc_types.cmi odoc_name.cmi 
+odoc_exception.cmx: ../typing/types.cmx odoc_types.cmx odoc_name.cmx 
 odoc_global.cmo: ../utils/clflags.cmo odoc_global.cmi 
 odoc_global.cmx: ../utils/clflags.cmx odoc_global.cmi 
-odoc_html.cmo: odoc_dag2html.cmi odoc_info.cmi odoc_messages.cmo \
-    odoc_ocamlhtml.cmo odoc_text.cmi 
-odoc_html.cmx: odoc_dag2html.cmx odoc_info.cmx odoc_messages.cmx \
-    odoc_ocamlhtml.cmx odoc_text.cmx 
-odoc_info.cmo: odoc_analyse.cmi odoc_args.cmi odoc_class.cmo \
-    odoc_comments.cmi odoc_dep.cmo odoc_exception.cmo odoc_global.cmi \
-    odoc_messages.cmo odoc_misc.cmi odoc_module.cmo odoc_name.cmi \
-    odoc_parameter.cmo odoc_print.cmi odoc_scan.cmo odoc_search.cmi \
-    odoc_str.cmi odoc_text.cmi odoc_type.cmo odoc_types.cmi odoc_value.cmo \
-    ../typing/printtyp.cmi odoc_info.cmi 
-odoc_info.cmx: odoc_analyse.cmx odoc_args.cmx odoc_class.cmx \
-    odoc_comments.cmx odoc_dep.cmx odoc_exception.cmx odoc_global.cmx \
-    odoc_messages.cmx odoc_misc.cmx odoc_module.cmx odoc_name.cmx \
-    odoc_parameter.cmx odoc_print.cmx odoc_scan.cmx odoc_search.cmx \
-    odoc_str.cmx odoc_text.cmx odoc_type.cmx odoc_types.cmx odoc_value.cmx \
-    ../typing/printtyp.cmx odoc_info.cmi 
-odoc_latex.cmo: odoc_info.cmi odoc_latex_style.cmo odoc_messages.cmo \
-    odoc_to_text.cmo 
-odoc_latex.cmx: odoc_info.cmx odoc_latex_style.cmx odoc_messages.cmx \
-    odoc_to_text.cmx 
-odoc_lexer.cmo: odoc_args.cmi odoc_comments_global.cmi odoc_messages.cmo \
-    odoc_parser.cmi 
-odoc_lexer.cmx: odoc_args.cmx odoc_comments_global.cmx odoc_messages.cmx \
-    odoc_parser.cmx 
-odoc_man.cmo: odoc_info.cmi odoc_messages.cmo odoc_misc.cmi odoc_print.cmi \
-    odoc_str.cmi 
-odoc_man.cmx: odoc_info.cmx odoc_messages.cmx odoc_misc.cmx odoc_print.cmx \
-    odoc_str.cmx 
-odoc_merge.cmo: odoc_args.cmi odoc_class.cmo odoc_exception.cmo \
-    odoc_messages.cmo odoc_module.cmo odoc_name.cmi odoc_parameter.cmo \
-    odoc_type.cmo odoc_types.cmi odoc_value.cmo odoc_merge.cmi 
-odoc_merge.cmx: odoc_args.cmx odoc_class.cmx odoc_exception.cmx \
-    odoc_messages.cmx odoc_module.cmx odoc_name.cmx odoc_parameter.cmx \
-    odoc_type.cmx odoc_types.cmx odoc_value.cmx odoc_merge.cmi 
-odoc_messages.cmo: ../utils/config.cmi odoc_global.cmi 
-odoc_messages.cmx: ../utils/config.cmx odoc_global.cmx 
-odoc_misc.cmo: ../typing/btype.cmi ../typing/ctype.cmi ../typing/ident.cmi \
-    ../parsing/longident.cmi odoc_messages.cmo odoc_types.cmi \
-    ../typing/path.cmi ../typing/types.cmi odoc_misc.cmi 
-odoc_misc.cmx: ../typing/btype.cmx ../typing/ctype.cmx ../typing/ident.cmx \
-    ../parsing/longident.cmx odoc_messages.cmx odoc_types.cmx \
-    ../typing/path.cmx ../typing/types.cmx odoc_misc.cmi 
-odoc_module.cmo: odoc_class.cmo odoc_exception.cmo odoc_name.cmi \
-    odoc_type.cmo odoc_types.cmi odoc_value.cmo ../typing/types.cmi 
-odoc_module.cmx: odoc_class.cmx odoc_exception.cmx odoc_name.cmx \
-    odoc_type.cmx odoc_types.cmx odoc_value.cmx ../typing/types.cmx 
-odoc_name.cmo: ../typing/ident.cmi ../parsing/longident.cmi \
-    ../typing/path.cmi odoc_name.cmi 
-odoc_name.cmx: ../typing/ident.cmx ../parsing/longident.cmx \
-    ../typing/path.cmx odoc_name.cmi 
-odoc_opt.cmo: ../utils/clflags.cmo ../utils/config.cmi ../utils/misc.cmi \
-    odoc_analyse.cmi odoc_args.cmi odoc_dot.cmo odoc_global.cmi odoc_html.cmo \
-    odoc_info.cmi odoc_latex.cmo odoc_man.cmo odoc_messages.cmo odoc_texi.cmo \
-    ../typing/typedtree.cmi 
-odoc_opt.cmx: ../utils/clflags.cmx ../utils/config.cmx ../utils/misc.cmx \
-    odoc_analyse.cmx odoc_args.cmx odoc_dot.cmx odoc_global.cmx odoc_html.cmx \
-    odoc_info.cmx odoc_latex.cmx odoc_man.cmx odoc_messages.cmx odoc_texi.cmx \
-    ../typing/typedtree.cmx 
-odoc_parameter.cmo: odoc_types.cmi ../typing/types.cmi 
-odoc_parameter.cmx: odoc_types.cmx ../typing/types.cmx 
-odoc_parser.cmo: odoc_comments_global.cmi odoc_types.cmi odoc_parser.cmi 
-odoc_parser.cmx: odoc_comments_global.cmx odoc_types.cmx odoc_parser.cmi 
-odoc_print.cmo: ../typing/printtyp.cmi ../typing/types.cmi odoc_print.cmi 
-odoc_print.cmx: ../typing/printtyp.cmx ../typing/types.cmx odoc_print.cmi 
-odoc_scan.cmo: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \
-    odoc_type.cmo odoc_types.cmi odoc_value.cmo 
-odoc_scan.cmx: odoc_class.cmx odoc_exception.cmx odoc_module.cmx \
-    odoc_type.cmx odoc_types.cmx odoc_value.cmx 
-odoc_search.cmo: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \
-    odoc_name.cmi odoc_parameter.cmo odoc_type.cmo odoc_types.cmi \
-    odoc_value.cmo odoc_search.cmi 
-odoc_search.cmx: odoc_class.cmx odoc_exception.cmx odoc_module.cmx \
-    odoc_name.cmx odoc_parameter.cmx odoc_type.cmx odoc_types.cmx \
-    odoc_value.cmx odoc_search.cmi 
+odoc_html.cmo: odoc_text.cmi odoc_ocamlhtml.cmo odoc_messages.cmo \
+    odoc_info.cmi odoc_dag2html.cmi 
+odoc_html.cmx: odoc_text.cmx odoc_ocamlhtml.cmx odoc_messages.cmx \
+    odoc_info.cmx odoc_dag2html.cmx 
+odoc_info.cmo: ../typing/printtyp.cmi odoc_value.cmo odoc_types.cmi \
+    odoc_type.cmo odoc_text.cmi odoc_str.cmi odoc_search.cmi odoc_scan.cmo \
+    odoc_print.cmi odoc_parameter.cmo odoc_name.cmi odoc_module.cmo \
+    odoc_misc.cmi odoc_messages.cmo odoc_global.cmi odoc_exception.cmo \
+    odoc_dep.cmo odoc_comments.cmi odoc_class.cmo odoc_args.cmi \
+    odoc_analyse.cmi odoc_info.cmi 
+odoc_info.cmx: ../typing/printtyp.cmx odoc_value.cmx odoc_types.cmx \
+    odoc_type.cmx odoc_text.cmx odoc_str.cmx odoc_search.cmx odoc_scan.cmx \
+    odoc_print.cmx odoc_parameter.cmx odoc_name.cmx odoc_module.cmx \
+    odoc_misc.cmx odoc_messages.cmx odoc_global.cmx odoc_exception.cmx \
+    odoc_dep.cmx odoc_comments.cmx odoc_class.cmx odoc_args.cmx \
+    odoc_analyse.cmx odoc_info.cmi 
+odoc_latex.cmo: odoc_to_text.cmo odoc_messages.cmo odoc_latex_style.cmo \
+    odoc_info.cmi 
+odoc_latex.cmx: odoc_to_text.cmx odoc_messages.cmx odoc_latex_style.cmx \
+    odoc_info.cmx 
+odoc_lexer.cmo: odoc_parser.cmi odoc_messages.cmo odoc_comments_global.cmi \
+    odoc_args.cmi 
+odoc_lexer.cmx: odoc_parser.cmx odoc_messages.cmx odoc_comments_global.cmx \
+    odoc_args.cmx 
+odoc_man.cmo: odoc_str.cmi odoc_print.cmi odoc_misc.cmi odoc_messages.cmo \
+    odoc_info.cmi odoc_args.cmi 
+odoc_man.cmx: odoc_str.cmx odoc_print.cmx odoc_misc.cmx odoc_messages.cmx \
+    odoc_info.cmx odoc_args.cmx 
+odoc_merge.cmo: odoc_value.cmo odoc_types.cmi odoc_type.cmo \
+    odoc_parameter.cmo odoc_name.cmi odoc_module.cmo odoc_messages.cmo \
+    odoc_exception.cmo odoc_class.cmo odoc_args.cmi odoc_merge.cmi 
+odoc_merge.cmx: odoc_value.cmx odoc_types.cmx odoc_type.cmx \
+    odoc_parameter.cmx odoc_name.cmx odoc_module.cmx odoc_messages.cmx \
+    odoc_exception.cmx odoc_class.cmx odoc_args.cmx odoc_merge.cmi 
+odoc_messages.cmo: odoc_global.cmi ../utils/config.cmi 
+odoc_messages.cmx: odoc_global.cmx ../utils/config.cmx 
+odoc_misc.cmo: ../typing/types.cmi ../typing/predef.cmi ../typing/path.cmi \
+    odoc_types.cmi odoc_messages.cmo ../parsing/longident.cmi \
+    ../typing/ctype.cmi ../typing/btype.cmi odoc_misc.cmi 
+odoc_misc.cmx: ../typing/types.cmx ../typing/predef.cmx ../typing/path.cmx \
+    odoc_types.cmx odoc_messages.cmx ../parsing/longident.cmx \
+    ../typing/ctype.cmx ../typing/btype.cmx odoc_misc.cmi 
+odoc_module.cmo: ../typing/types.cmi odoc_value.cmo odoc_types.cmi \
+    odoc_type.cmo odoc_name.cmi odoc_exception.cmo odoc_class.cmo 
+odoc_module.cmx: ../typing/types.cmx odoc_value.cmx odoc_types.cmx \
+    odoc_type.cmx odoc_name.cmx odoc_exception.cmx odoc_class.cmx 
+odoc_name.cmo: ../typing/path.cmi ../parsing/longident.cmi \
+    ../typing/ident.cmi odoc_name.cmi 
+odoc_name.cmx: ../typing/path.cmx ../parsing/longident.cmx \
+    ../typing/ident.cmx odoc_name.cmi 
+odoc_opt.cmo: ../typing/typedtree.cmi odoc_texi.cmo odoc_messages.cmo \
+    odoc_man.cmo odoc_latex.cmo odoc_info.cmi odoc_html.cmo odoc_global.cmi \
+    odoc_dot.cmo odoc_args.cmi odoc_analyse.cmi ../utils/misc.cmi \
+    ../utils/config.cmi ../utils/clflags.cmo 
+odoc_opt.cmx: ../typing/typedtree.cmx odoc_texi.cmx odoc_messages.cmx \
+    odoc_man.cmx odoc_latex.cmx odoc_info.cmx odoc_html.cmx odoc_global.cmx \
+    odoc_dot.cmx odoc_args.cmx odoc_analyse.cmx ../utils/misc.cmx \
+    ../utils/config.cmx ../utils/clflags.cmx 
+odoc_parameter.cmo: ../typing/types.cmi odoc_types.cmi 
+odoc_parameter.cmx: ../typing/types.cmx odoc_types.cmx 
+odoc_parser.cmo: odoc_types.cmi odoc_comments_global.cmi odoc_parser.cmi 
+odoc_parser.cmx: odoc_types.cmx odoc_comments_global.cmx odoc_parser.cmi 
+odoc_print.cmo: ../typing/types.cmi ../typing/printtyp.cmi odoc_print.cmi 
+odoc_print.cmx: ../typing/types.cmx ../typing/printtyp.cmx odoc_print.cmi 
+odoc_scan.cmo: odoc_value.cmo odoc_types.cmi odoc_type.cmo odoc_module.cmo \
+    odoc_exception.cmo odoc_class.cmo 
+odoc_scan.cmx: odoc_value.cmx odoc_types.cmx odoc_type.cmx odoc_module.cmx \
+    odoc_exception.cmx odoc_class.cmx 
+odoc_search.cmo: odoc_value.cmo odoc_types.cmi odoc_type.cmo \
+    odoc_parameter.cmo odoc_name.cmi odoc_module.cmo odoc_exception.cmo \
+    odoc_class.cmo odoc_search.cmi 
+odoc_search.cmx: odoc_value.cmx odoc_types.cmx odoc_type.cmx \
+    odoc_parameter.cmx odoc_name.cmx odoc_module.cmx odoc_exception.cmx \
+    odoc_class.cmx odoc_search.cmi 
 odoc_see_lexer.cmo: odoc_parser.cmi 
 odoc_see_lexer.cmx: odoc_parser.cmx 
-odoc_sig.cmo: ../parsing/asttypes.cmi ../typing/btype.cmi \
-    ../parsing/location.cmi ../utils/misc.cmi odoc_args.cmi odoc_class.cmo \
-    odoc_env.cmi odoc_exception.cmo odoc_global.cmi odoc_merge.cmi \
-    odoc_messages.cmo odoc_misc.cmi odoc_module.cmo odoc_name.cmi \
-    odoc_parameter.cmo odoc_print.cmi odoc_type.cmo odoc_types.cmi \
-    odoc_value.cmo ../parsing/parsetree.cmi ../typing/path.cmi \
-    ../typing/typedtree.cmi ../typing/types.cmi odoc_sig.cmi 
-odoc_sig.cmx: ../parsing/asttypes.cmi ../typing/btype.cmx \
-    ../parsing/location.cmx ../utils/misc.cmx odoc_args.cmx odoc_class.cmx \
-    odoc_env.cmx odoc_exception.cmx odoc_global.cmx odoc_merge.cmx \
-    odoc_messages.cmx odoc_misc.cmx odoc_module.cmx odoc_name.cmx \
-    odoc_parameter.cmx odoc_print.cmx odoc_type.cmx odoc_types.cmx \
-    odoc_value.cmx ../parsing/parsetree.cmi ../typing/path.cmx \
-    ../typing/typedtree.cmx ../typing/types.cmx odoc_sig.cmi 
-odoc_str.cmo: odoc_exception.cmo odoc_messages.cmo odoc_misc.cmi \
-    odoc_name.cmi odoc_print.cmi odoc_type.cmo odoc_value.cmo \
-    ../typing/printtyp.cmi ../typing/types.cmi odoc_str.cmi 
-odoc_str.cmx: odoc_exception.cmx odoc_messages.cmx odoc_misc.cmx \
-    odoc_name.cmx odoc_print.cmx odoc_type.cmx odoc_value.cmx \
-    ../typing/printtyp.cmx ../typing/types.cmx odoc_str.cmi 
+odoc_sig.cmo: ../typing/types.cmi ../typing/typedtree.cmi ../typing/path.cmi \
+    ../parsing/parsetree.cmi odoc_value.cmo odoc_types.cmi odoc_type.cmo \
+    odoc_print.cmi odoc_parameter.cmo odoc_name.cmi odoc_module.cmo \
+    odoc_misc.cmi odoc_messages.cmo odoc_merge.cmi odoc_global.cmi \
+    odoc_exception.cmo odoc_env.cmi odoc_class.cmo odoc_args.cmi \
+    ../utils/misc.cmi ../parsing/location.cmi ../typing/btype.cmi \
+    ../parsing/asttypes.cmi odoc_sig.cmi 
+odoc_sig.cmx: ../typing/types.cmx ../typing/typedtree.cmx ../typing/path.cmx \
+    ../parsing/parsetree.cmi odoc_value.cmx odoc_types.cmx odoc_type.cmx \
+    odoc_print.cmx odoc_parameter.cmx odoc_name.cmx odoc_module.cmx \
+    odoc_misc.cmx odoc_messages.cmx odoc_merge.cmx odoc_global.cmx \
+    odoc_exception.cmx odoc_env.cmx odoc_class.cmx odoc_args.cmx \
+    ../utils/misc.cmx ../parsing/location.cmx ../typing/btype.cmx \
+    ../parsing/asttypes.cmi odoc_sig.cmi 
+odoc_str.cmo: ../typing/types.cmi ../typing/printtyp.cmi odoc_value.cmo \
+    odoc_type.cmo odoc_print.cmi odoc_name.cmi odoc_misc.cmi \
+    odoc_messages.cmo odoc_exception.cmo odoc_class.cmo odoc_str.cmi 
+odoc_str.cmx: ../typing/types.cmx ../typing/printtyp.cmx odoc_value.cmx \
+    odoc_type.cmx odoc_print.cmx odoc_name.cmx odoc_misc.cmx \
+    odoc_messages.cmx odoc_exception.cmx odoc_class.cmx odoc_str.cmi 
 odoc_test.cmo: odoc_info.cmi 
 odoc_test.cmx: odoc_info.cmx 
-odoc_texi.cmo: odoc_info.cmi odoc_messages.cmo odoc_to_text.cmo 
-odoc_texi.cmx: odoc_info.cmx odoc_messages.cmx odoc_to_text.cmx 
-odoc_text.cmo: odoc_text_lexer.cmo odoc_text_parser.cmi odoc_types.cmi \
+odoc_texi.cmo: odoc_to_text.cmo odoc_messages.cmo odoc_info.cmi 
+odoc_texi.cmx: odoc_to_text.cmx odoc_messages.cmx odoc_info.cmx 
+odoc_text.cmo: odoc_types.cmi odoc_text_parser.cmi odoc_text_lexer.cmo \
     odoc_text.cmi 
-odoc_text.cmx: odoc_text_lexer.cmx odoc_text_parser.cmx odoc_types.cmx \
+odoc_text.cmx: odoc_types.cmx odoc_text_parser.cmx odoc_text_lexer.cmx \
     odoc_text.cmi 
 odoc_text_lexer.cmo: odoc_text_parser.cmi 
 odoc_text_lexer.cmx: odoc_text_parser.cmx 
-odoc_text_parser.cmo: odoc_misc.cmi odoc_types.cmi odoc_text_parser.cmi 
-odoc_text_parser.cmx: odoc_misc.cmx odoc_types.cmx odoc_text_parser.cmi 
-odoc_to_text.cmo: odoc_info.cmi odoc_messages.cmo 
-odoc_to_text.cmx: odoc_info.cmx odoc_messages.cmx 
-odoc_type.cmo: odoc_name.cmi odoc_types.cmi ../typing/types.cmi 
-odoc_type.cmx: odoc_name.cmx odoc_types.cmx ../typing/types.cmx 
+odoc_text_parser.cmo: odoc_types.cmi odoc_misc.cmi odoc_text_parser.cmi 
+odoc_text_parser.cmx: odoc_types.cmx odoc_misc.cmx odoc_text_parser.cmi 
+odoc_to_text.cmo: odoc_messages.cmo odoc_info.cmi 
+odoc_to_text.cmx: odoc_messages.cmx odoc_info.cmx 
+odoc_type.cmo: ../typing/types.cmi odoc_types.cmi odoc_name.cmi 
+odoc_type.cmx: ../typing/types.cmx odoc_types.cmx odoc_name.cmx 
 odoc_types.cmo: odoc_messages.cmo odoc_types.cmi 
 odoc_types.cmx: odoc_messages.cmx odoc_types.cmi 
-odoc_value.cmo: odoc_name.cmi odoc_parameter.cmo odoc_types.cmi \
-    ../typing/printtyp.cmi ../typing/types.cmi 
-odoc_value.cmx: odoc_name.cmx odoc_parameter.cmx odoc_types.cmx \
-    ../typing/printtyp.cmx ../typing/types.cmx 
-odoc_analyse.cmi: odoc_module.cmo 
-odoc_args.cmi: odoc_module.cmo odoc_types.cmi 
-odoc_ast.cmi: odoc_module.cmo odoc_name.cmi odoc_sig.cmi \
-    ../parsing/parsetree.cmi ../typing/path.cmi ../typing/typedtree.cmi \
-    ../typing/types.cmi 
+odoc_value.cmo: ../typing/types.cmi ../typing/printtyp.cmi odoc_types.cmi \
+    odoc_parameter.cmo odoc_name.cmi 
+odoc_value.cmx: ../typing/types.cmx ../typing/printtyp.cmx odoc_types.cmx \
+    odoc_parameter.cmx odoc_name.cmx 
+odoc_analyse.cmi: odoc_module.cmo odoc_args.cmi 
+odoc_args.cmi: odoc_types.cmi odoc_module.cmo 
+odoc_ast.cmi: ../typing/types.cmi ../typing/typedtree.cmi ../typing/path.cmi \
+    ../parsing/parsetree.cmi odoc_sig.cmi odoc_name.cmi odoc_module.cmo 
 odoc_comments.cmi: odoc_types.cmi 
 odoc_cross.cmi: odoc_module.cmo 
 odoc_dag2html.cmi: odoc_info.cmi 
-odoc_env.cmi: odoc_name.cmi ../typing/types.cmi 
-odoc_info.cmi: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \
-    odoc_parameter.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmi \
-    odoc_value.cmo ../typing/types.cmi 
-odoc_merge.cmi: odoc_module.cmo odoc_types.cmi 
-odoc_misc.cmi: ../parsing/longident.cmi odoc_types.cmi ../typing/types.cmi 
-odoc_name.cmi: ../typing/ident.cmi ../parsing/longident.cmi \
-    ../typing/path.cmi 
+odoc_env.cmi: ../typing/types.cmi odoc_name.cmi 
+odoc_info.cmi: ../typing/types.cmi odoc_value.cmo odoc_types.cmi \
+    odoc_type.cmo odoc_search.cmi odoc_parameter.cmo odoc_module.cmo \
+    odoc_exception.cmo odoc_class.cmo 
+odoc_merge.cmi: odoc_types.cmi odoc_module.cmo 
+odoc_misc.cmi: ../typing/types.cmi odoc_types.cmi ../parsing/longident.cmi 
+odoc_name.cmi: ../typing/path.cmi ../parsing/longident.cmi \
+    ../typing/ident.cmi 
 odoc_parser.cmi: odoc_types.cmi 
 odoc_print.cmi: ../typing/types.cmi 
-odoc_search.cmi: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \
-    odoc_type.cmo odoc_types.cmi odoc_value.cmo 
-odoc_sig.cmi: odoc_class.cmo odoc_env.cmi odoc_module.cmo odoc_name.cmi \
-    odoc_type.cmo odoc_types.cmi ../parsing/parsetree.cmi ../typing/types.cmi 
-odoc_str.cmi: odoc_exception.cmo odoc_type.cmo odoc_value.cmo \
-    ../typing/types.cmi 
+odoc_search.cmi: odoc_value.cmo odoc_types.cmi odoc_type.cmo odoc_module.cmo \
+    odoc_exception.cmo odoc_class.cmo 
+odoc_sig.cmi: ../typing/types.cmi ../parsing/parsetree.cmi odoc_types.cmi \
+    odoc_type.cmo odoc_name.cmi odoc_module.cmo odoc_env.cmi odoc_class.cmo 
+odoc_str.cmi: ../typing/types.cmi odoc_value.cmo odoc_type.cmo \
+    odoc_exception.cmo odoc_class.cmo 
 odoc_text.cmi: odoc_types.cmi 
 odoc_text_parser.cmi: odoc_types.cmi 

diff --git a/ocamldoc/CVS/Entries b/ocamldoc/CVS/Entries
new file mode 100644 (file)
index 0000000..76c9d26
--- /dev/null
+++ b/ocamldoc/CVS/Entries
@@ -0,0 +1,77 @@
+/.cvsignore/1.3/Fri Nov 21 16:16:14 2003//Tocaml3083
+/.depend/1.24.4.2/Fri Feb 18 16:08:37 2005//Tocaml3083
+/Changes.txt/1.35.2.5/Mon Nov 22 16:25:38 2004//Tocaml3083
+/Makefile/1.55.4.1/Fri Feb 18 16:08:37 2005//Tocaml3083
+/Makefile.nt/1.25/Fri Apr 23 14:10:51 2004//Tocaml3083
+/ocamldoc.hva/1.2.8.1/Fri Jul  9 13:27:48 2004//Tocaml3083
+/ocamldoc.sty/1.3/Fri Oct 11 08:24:13 2002//Tocaml3083
+/odoc.ml/1.7.4.1/Fri Jul  9 10:42:09 2004//Tocaml3083
+/odoc_analyse.ml/1.8.6.1/Fri Aug  6 13:42:16 2004//Tocaml3083
+/odoc_analyse.mli/1.3.6.1/Fri Aug  6 13:42:16 2004//Tocaml3083
+/odoc_args.ml/1.15.6.3/Fri Feb 18 16:08:37 2005//Tocaml3083
+/odoc_args.mli/1.12.6.2/Fri Feb 18 16:08:37 2005//Tocaml3083
+/odoc_ast.ml/1.24/Sat Apr 17 12:36:14 2004//Tocaml3083
+/odoc_ast.mli/1.4/Mon Nov 24 10:39:29 2003//Tocaml3083
+/odoc_class.ml/1.5/Fri Mar 26 15:57:02 2004//Tocaml3083
+/odoc_comments.ml/1.4/Mon Nov 24 10:39:29 2003//Tocaml3083
+/odoc_comments.mli/1.3/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_comments_global.ml/1.2/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_comments_global.mli/1.2/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_config.ml/1.1/Wed Jan 28 13:36:20 2004//Tocaml3083
+/odoc_config.mli/1.1/Wed Jan 28 13:36:20 2004//Tocaml3083
+/odoc_control.ml/1.2/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_cross.ml/1.15/Sun May 23 10:41:49 2004//Tocaml3083
+/odoc_cross.mli/1.2/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_dag2html.ml/1.3/Mon Nov 24 10:39:30 2003//Tocaml3083
+/odoc_dag2html.mli/1.3/Mon Nov 24 10:39:31 2003//Tocaml3083
+/odoc_dep.ml/1.6/Fri Mar  5 14:57:50 2004//Tocaml3083
+/odoc_dot.ml/1.6/Mon Nov 24 10:39:31 2003//Tocaml3083
+/odoc_env.ml/1.7/Sat Jun 12 08:55:46 2004//Tocaml3083
+/odoc_env.mli/1.3/Mon Nov 24 10:39:31 2003//Tocaml3083
+/odoc_exception.ml/1.3/Mon Nov 24 10:39:31 2003//Tocaml3083
+/odoc_global.ml/1.3/Mon Nov 24 10:41:03 2003//Tocaml3083
+/odoc_global.mli/1.2/Mon Nov 24 10:41:03 2003//Tocaml3083
+/odoc_html.ml/1.52.4.2/Fri Aug  6 12:35:07 2004//Tocaml3083
+/odoc_info.ml/1.20.4.1/Fri Aug  6 12:35:07 2004//Tocaml3083
+/odoc_info.mli/1.36.4.3/Fri Feb 18 16:08:37 2005//Tocaml3083
+/odoc_inherit.ml/1.2/Mon Nov 24 10:41:04 2003//Tocaml3083
+/odoc_latex.ml/1.36.2.2/Fri Aug  6 12:35:07 2004//Tocaml3083
+/odoc_latex_style.ml/1.5/Fri Jun 11 14:25:50 2004//Tocaml3083
+/odoc_lexer.mll/1.4/Mon Nov 24 10:41:04 2003//Tocaml3083
+/odoc_man.ml/1.22.4.1/Fri Feb 18 16:08:37 2005//Tocaml3083
+/odoc_merge.ml/1.10/Sun Jan 18 14:26:14 2004//Tocaml3083
+/odoc_merge.mli/1.3/Mon Nov 24 10:41:05 2003//Tocaml3083
+/odoc_messages.ml/1.24.4.4/Fri Feb 18 16:08:37 2005//Tocaml3083
+/odoc_misc.ml/1.17.4.2/Fri Oct  1 09:43:24 2004//Tocaml3083
+/odoc_misc.mli/1.10.4.2/Fri Oct  1 09:43:24 2004//Tocaml3083
+/odoc_module.ml/1.9.4.1/Fri Jun 25 13:39:17 2004//Tocaml3083
+/odoc_name.ml/1.9/Fri Mar 26 09:09:50 2004//Tocaml3083
+/odoc_name.mli/1.4/Fri Mar 26 09:09:50 2004//Tocaml3083
+/odoc_ocamlhtml.mll/1.9/Sun Mar 14 13:52:01 2004//Tocaml3083
+/odoc_opt.ml/1.5/Tue Aug 13 14:09:23 2002//Tocaml3083
+/odoc_parameter.ml/1.8/Fri Apr  2 15:10:57 2004//Tocaml3083
+/odoc_parser.mly/1.3/Mon Nov 24 10:43:11 2003//Tocaml3083
+/odoc_print.ml/1.3/Tue May 18 13:28:00 2004//Tocaml3083
+/odoc_print.mli/1.2/Fri Mar 26 09:09:50 2004//Tocaml3083
+/odoc_scan.ml/1.3/Mon Nov 24 10:43:11 2003//Tocaml3083
+/odoc_search.ml/1.6/Sun May 23 10:41:50 2004//Tocaml3083
+/odoc_search.mli/1.4/Mon Nov 24 10:43:12 2003//Tocaml3083
+/odoc_see_lexer.mll/1.3/Mon Nov 24 10:43:12 2003//Tocaml3083
+/odoc_sig.ml/1.30.2.3/Fri Oct  1 09:43:24 2004//Tocaml3083
+/odoc_sig.mli/1.5/Mon Nov 24 10:43:12 2003//Tocaml3083
+/odoc_str.ml/1.9.4.2/Wed Nov  3 08:16:49 2004//Tocaml3083
+/odoc_str.mli/1.5.4.1/Fri Aug  6 12:35:07 2004//Tocaml3083
+/odoc_test.ml/1.1/Fri Feb 20 16:28:27 2004//Tocaml3083
+/odoc_texi.ml/1.17.4.1/Fri Jul  2 12:59:48 2004//Tocaml3083
+/odoc_text.ml/1.5/Sun May 23 10:41:50 2004//Tocaml3083
+/odoc_text.mli/1.3/Mon Nov 24 21:20:51 2003//Tocaml3083
+/odoc_text_lexer.mll/1.8/Sun May 23 10:41:50 2004//Tocaml3083
+/odoc_text_parser.mly/1.4/Sun May 23 10:41:50 2004//Tocaml3083
+/odoc_to_text.ml/1.14.4.2/Fri Aug  6 12:35:07 2004//Tocaml3083
+/odoc_type.ml/1.5/Mon Nov 24 10:44:07 2003//Tocaml3083
+/odoc_types.ml/1.7/Sun May 23 10:41:51 2004//Tocaml3083
+/odoc_types.mli/1.5/Sun May 23 10:41:51 2004//Tocaml3083
+/odoc_value.ml/1.5.6.1/Fri Jul  2 12:59:49 2004//Tocaml3083
+/remove_DEBUG/1.3/Thu Apr 15 16:18:52 2004//Tocaml3083
+/runocamldoc/1.6/Tue Jul 23 14:11:53 2002//Tocaml3083
+D

diff --git a/ocamldoc/CVS/Repository b/ocamldoc/CVS/Repository
new file mode 100644 (file)
index 0000000..a250fea
--- /dev/null
+++ b/ocamldoc/CVS/Repository
@@ -0,0 +1 @@
+csl/ocamldoc

diff --git a/ocamldoc/CVS/Root b/ocamldoc/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/ocamldoc/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/ocamldoc/CVS/Tag b/ocamldoc/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/ocamldoc/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile
index 610064b13461ed70168fb5100cb82a71bc41d2b4..68051bb1f57a9c2f50d7ded9b0d8bb846476413b 100644 (file)
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
@@ -9,7 +9,7 @@
 #(*                                                                     *)
 #(***********************************************************************)
 
-# $Id: Makefile,v 1.55 2004/04/23 14:10:51 guesdon Exp $
+# $Id: Makefile,v 1.55.4.1 2005/02/18 16:08:37 guesdon Exp $
 
 include ../config/Makefile
 
@@ -26,23 +26,23 @@ OCAMLBIN = $(BINDIR)
 
 OCAMLPP=-pp './remove_DEBUG'
 
-# For installation 
+# For installation
 ##############
 MKDIR=mkdir -p
 CP=cp -f
 OCAMLDOC=ocamldoc
 OCAMLDOC_RUN=sh ./runocamldoc $(SUPPORTS_SHARED_LIBRARIES)
 OCAMLDOC_OPT=$(OCAMLDOC).opt
-OCAMLDOC_LIBCMA=odoc_info.cma 
+OCAMLDOC_LIBCMA=odoc_info.cma
 OCAMLDOC_LIBCMI=odoc_info.cmi
-OCAMLDOC_LIBCMXA=odoc_info.cmxa 
+OCAMLDOC_LIBCMXA=odoc_info.cmxa
 OCAMLDOC_LIBA=odoc_info.a
 INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
 INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
 INSTALL_BINDIR=$(OCAMLBIN)
 INSTALL_MANODIR=$(MANDIR)/man3
 
-INSTALL_MLIS=odoc_info.mli 
+INSTALL_MLIS=odoc_info.mli
 INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
 
 ODOC_TEST=odoc_test.cmo
@@ -193,8 +193,8 @@ lib: $(OCAMLDOC_LIBCMA) $(OCAMLDOC_LIBCMI) $(ODOC_TEST)
 
 opt.opt: exeopt libopt
 exeopt: $(OCAMLDOC_OPT)
-libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI) 
-debug: 
+libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI)
+debug:
        make OCAMLPP=""
 
 $(OCAMLDOC): $(EXECMOFILES) odoc.cmo
@@ -274,26 +274,26 @@ installopt_really:
 # Testing :
 ###########
 test: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -html -colorize-code -sort -d $@ $(INCLUDES) -dump $@/ocamldoc.odoc odoc*.ml odoc*.mli
 
 test_stdlib: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -html -colorize-code -sort -d $@ $(INCLUDES) -dump $@/stdlib.odoc -keep-code \
        ../stdlib/pervasives.ml ../stdlib/*.mli \
        ../otherlibs/unix/unix.mli \
        ../otherlibs/str/str.mli
 
 test_framed: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -g odoc_fhtml.cmo -sort -colorize-code -d $@ $(INCLUDES) odoc*.ml odoc*.mli
 
 test_latex: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -latex -sort -o $@/test.tex -d $@ $(INCLUDES) odoc*.ml odoc*.mli ../stdlib/*.mli ../otherlibs/unix/unix.mli
 
 test_latex_simple: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -latex -sort -o $@/test.tex -d $@ $(INCLUDES) \
        -latextitle 6,subsection -latextitle 7,subsubection \
        ../stdlib/hashtbl.mli \
@@ -302,21 +302,21 @@ test_latex_simple: dummy
        ../stdlib/map.mli
 
 test_man: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -man -sort -d $@ $(INCLUDES) odoc*.ml odoc*.mli
 
 test_texi: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -texi -sort -d $@ $(INCLUDES) odoc*.ml odoc*.mli
 
 stdlib_man/Pervasives.3o: $(STDLIB_MLIS)
        $(MKDIR) stdlib_man
        $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \
-       -t "OCaml library" -man-mini -man-suffix 3o \
+       -t "OCaml library" -man-mini \
        $(STDLIB_MLIS)
 
 autotest_stdlib: dummy
-       $(MKDIR) $@ 
+       $(MKDIR) $@
        $(OCAMLDOC_RUN) -g autotest/odoc_test.cmo\
        $(INCLUDES) -keep-code \
        ../stdlib/pervasives.ml ../stdlib/*.mli \
@@ -331,7 +331,7 @@ clean:: dummy
        @rm -f $(OCAMLDOC)$(EXE) $(OCAMLDOC_OPT) *.cma *.cmxa *.cmo *.cmi *.cmx *.a *.o
        @rm -f odoc_parser.output odoc_text_parser.output
        @rm -f odoc_lexer.ml odoc_text_lexer.ml odoc_see_lexer.ml odoc_ocamlhtml.ml
-       @rm -f odoc_parser.ml odoc_parser.mli odoc_text_parser.ml odoc_text_parser.mli 
+       @rm -f odoc_parser.ml odoc_parser.mli odoc_text_parser.ml odoc_text_parser.mli
        @rm -rf stdlib_man
 
 depend::

diff --git a/ocamldoc/odoc_args.ml b/ocamldoc/odoc_args.ml
index 9b79f5897f4126289a6a15b9eb545ef25057aa8d..193e45ab198b7493755e427ca85f8d66e1901f43 100644 (file)
--- a/ocamldoc/odoc_args.ml
+++ b/ocamldoc/odoc_args.ml
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* cvsid $Id: odoc_args.ml,v 1.15.6.2 2004/08/06 13:42:16 guesdon Exp $ *)
+(* cvsid $Id: odoc_args.ml,v 1.15.6.3 2005/02/18 16:08:37 guesdon Exp $ *)
 
 (** Command-line arguments. *)
 
@@ -45,6 +45,7 @@ let dot_reduce = ref false
 let dot_colors  = ref (List.flatten M.default_dot_colors)
 
 let man_suffix = ref M.default_man_suffix
+let man_section = ref M.default_man_section
 
 let man_mini = ref false
 
@@ -76,7 +77,7 @@ let analyse_merge_options s =
     (M.merge_return_value, [Odoc_types.Merge_return_value]) ;
     (M.merge_custom, [Odoc_types.Merge_custom]) ;
     (M.merge_all, Odoc_types.all_merge_options)
-  ] 
+  ]
   in
   analyse_option_string l s
 
@@ -122,9 +123,9 @@ let index_only = ref false
 
 let colorize_code = ref false
 
-let with_header = ref true 
+let with_header = ref true
 
-let with_trailer = ref true 
+let with_trailer = ref true
 
 let separate_files = ref false
 
@@ -136,7 +137,7 @@ let latex_titles = ref [
   5, "subparagraph" ;
 ]
 
-let with_toc = ref true 
+let with_toc = ref true
 
 let with_index = ref true
 
@@ -157,19 +158,19 @@ let f_latex_title s =
     latex_titles := List.remove_assoc n !latex_titles ;
     latex_titles := (n, command) :: !latex_titles
   with
-    Not_found 
-  | Invalid_argument _ -> 
+    Not_found
+  | Invalid_argument _ ->
       incr Odoc_global.errors ;
       prerr_endline (M.wrong_format s)
 
 let add_hidden_modules s =
   let l = Str.split (Str.regexp ",") s in
-  List.iter 
+  List.iter
     (fun n ->
       let name = Str.global_replace (Str.regexp "[ \n\r\t]+") "" n in
       match name with
         "" -> ()
-      | _ -> 
+      | _ ->
           match name.[0] with
             'A'..'Z' -> hidden_modules := name :: !hidden_modules
           | _ ->
@@ -231,7 +232,7 @@ let options = ref [
   "-t", Arg.String (fun s -> title := Some s), M.option_title ;
   "-intro", Arg.String (fun s -> intro_file := Some s), M.option_intro ;
   "-hide", Arg.String add_hidden_modules, M.hide_modules ;
-  "-m", Arg.String (fun s -> merge_options := !merge_options @ (analyse_merge_options s)), 
+  "-m", Arg.String (fun s -> merge_options := !merge_options @ (analyse_merge_options s)),
   M.merge_options ^
   "\n\n *** choosing a generator ***\n";
 
@@ -239,7 +240,7 @@ let options = ref [
   "-html", Arg.Unit (fun () -> set_doc_generator !default_html_generator), M.generate_html ;
   "-latex", Arg.Unit (fun () -> set_doc_generator !default_latex_generator), M.generate_latex ;
   "-texi", Arg.Unit (fun () -> set_doc_generator !default_texi_generator), M.generate_texinfo ;
-  "-man", Arg.Unit (fun () -> set_doc_generator !default_man_generator), M.generate_man ;    
+  "-man", Arg.Unit (fun () -> set_doc_generator !default_man_generator), M.generate_man ;
   "-dot", Arg.Unit (fun () -> set_doc_generator !default_dot_generator), M.generate_dot ;
   "-customdir", Arg.Unit (fun () -> Printf.printf "%s\n" Odoc_config.custom_generators_path; exit 0),
   M.display_custom_generators_dir ;
@@ -270,7 +271,7 @@ let options = ref [
   "-latex-module-type-prefix", Arg.String (fun s -> latex_module_type_prefix := s), M.latex_module_type_prefix ;
   "-latex-class-prefix", Arg.String (fun s -> latex_class_prefix := s), M.latex_class_prefix ;
   "-latex-class-type-prefix", Arg.String (fun s -> latex_class_type_prefix := s), M.latex_class_type_prefix ;
-  "-notoc", Arg.Unit (fun () -> with_toc := false), 
+  "-notoc", Arg.Unit (fun () -> with_toc := false),
   M.no_toc ^
   "\n\n *** texinfo options ***\n";
 
@@ -278,8 +279,8 @@ let options = ref [
   "-noindex", Arg.Clear with_index, M.no_index ;
   "-esc8", Arg.Set esc_8bits, M.esc_8bits ;
   "-info-section", Arg.String ((:=) info_section), M.info_section ;
-  "-info-entry", Arg.String (fun s -> info_entry := !info_entry @ [ s ]), 
-  M.info_entry ^ 
+  "-info-entry", Arg.String (fun s -> info_entry := !info_entry @ [ s ]),
+  M.info_entry ^
   "\n\n *** dot options ***\n";
 
 (* dot only options *)
@@ -292,10 +293,11 @@ let options = ref [
 (* man only options *)
   "-man-mini", Arg.Set man_mini, M.man_mini ;
   "-man-suffix", Arg.String (fun s -> man_suffix := s), M.man_suffix ;
+  "-man-section", Arg.String (fun s -> man_section := s), M.man_section ;
 
-] 
+]
 
-let add_option o = 
+let add_option o =
   let (s,_,_) = o in
   let rec iter = function
       [] -> [o]
@@ -309,7 +311,7 @@ let add_option o =
 
 let parse ~html_generator ~latex_generator ~texi_generator ~man_generator ~dot_generator =
   let anonymous f =
-    let sf = 
+    let sf =
       if Filename.check_suffix f "ml" then
        Impl_file f
       else
@@ -330,9 +332,9 @@ let parse ~html_generator ~latex_generator ~texi_generator ~man_generator ~dot_g
       (M.usage^M.options_are)
   in
   (* we sort the hidden modules by name, to be sure that for example,
-     A.B is before A, so we will match against A.B before A in 
+     A.B is before A, so we will match against A.B before A in
      Odoc_name.hide_modules.*)
   hidden_modules := List.sort (fun a -> fun b -> - (compare a b)) !hidden_modules
 
 
-(* eof $Id: odoc_args.ml,v 1.15.6.2 2004/08/06 13:42:16 guesdon Exp $ *)
+(* eof $Id: odoc_args.ml,v 1.15.6.3 2005/02/18 16:08:37 guesdon Exp $ *)

diff --git a/ocamldoc/odoc_args.mli b/ocamldoc/odoc_args.mli
index d81ed0b9f09ef288c002a44ce3e5637dceec7989..6a138553bf662a1b042d43857fe8f16e515aef48 100644 (file)
--- a/ocamldoc/odoc_args.mli
+++ b/ocamldoc/odoc_args.mli
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: odoc_args.mli,v 1.12.6.1 2004/08/06 13:42:16 guesdon Exp $ *)
+(* $Id: odoc_args.mli,v 1.12.6.2 2005/02/18 16:08:37 guesdon Exp $ *)
 
 (** Analysis of the command line arguments. *)
 
@@ -21,38 +21,38 @@ type source_file =
 (** The include_dirs in the OCaml compiler. *)
 val include_dirs : string list ref
 
-(** Indicate if we are in bytecode mode or not. 
+(** Indicate if we are in bytecode mode or not.
    (For the [ocamldoc] command).*)
 val bytecode_mode : bool ref
 
 (** The class type of documentation generators. *)
 class type doc_generator =
   object method generate : Odoc_module.t_module list -> unit end
-    
+
 (** The function to be used to create a generator. *)
 val doc_generator : doc_generator option ref
-    
+
 (** The merge options to be used. *)
 val merge_options : Odoc_types.merge_option list ref
 
 (** Classic mode or not. *)
 val classic : bool ref
-    
+
 (** The file used by the generators outputting only one file. *)
 val out_file : string ref
 
 (** The optional file name to dump the collected information into.*)
 val dump : string option ref
-    
+
 (** The list of information files to load. *)
 val load : string list ref
-    
+
 (** Verbose mode or not. *)
 val verbose : bool ref
-    
+
 (** We must sort the list of top modules or not.*)
 val sort_modules : bool ref
-    
+
 (** We must not stop at the stop special comments. Default is false (we stop).*)
 val no_stop : bool ref
 
@@ -67,10 +67,10 @@ val keep_code : bool ref
 
 (** To inverse implementation and interface files when merging. *)
 val inverse_merge_ml_mli : bool ref
-    
+
 (** The optional title to use in the generated documentation. *)
 val title : string option ref
-    
+
 (** The optional file whose content can be used as intro text. *)
 val intro_file : string option ref
 
@@ -83,7 +83,7 @@ val hidden_modules : string list ref
 
 (** The directory where files have to be generated. *)
 val target_dir : string ref
-    
+
 (** An optional file to use where a CSS style is defined (for HTML). *)
 val css_style : string option ref
 
@@ -95,10 +95,10 @@ val colorize_code : bool ref
 
 (** The flag which indicates if we must generate a header (for LaTeX). *)
 val with_header : bool ref
-    
+
 (** The flag which indicates if we must generate a trailer (for LaTeX). *)
 val with_trailer : bool ref
-    
+
 (** The flag to indicate if we must generate one file per module (for LaTeX). *)
 val separate_files : bool ref
 
@@ -162,25 +162,27 @@ val dot_colors : string list ref
 (** The suffix for man pages. *)
 val man_suffix : string ref
 
+(** The section for man pages. *)
+val man_section : string ref
+
 (** The flag to generate all man pages or only for modules and classes.*)
 val man_mini : bool ref
 
 (** The files to be analysed. *)
 val files : source_file list ref
-    
+
 (** To set the documentation generator. *)
 val set_doc_generator : doc_generator option -> unit
-    
+
 (** Add an option specification. *)
 val add_option : string * Arg.spec * string -> unit
-    
-(** Parse the args. 
+
+(** Parse the args.
    [byte] indicate if we are in bytecode mode (default is [true]).*)
 val parse :
-    html_generator:doc_generator -> 
-      latex_generator:doc_generator -> 
-        texi_generator:doc_generator -> 
-          man_generator:doc_generator -> 
-            dot_generator:doc_generator -> 
+    html_generator:doc_generator ->
+      latex_generator:doc_generator ->
+        texi_generator:doc_generator ->
+          man_generator:doc_generator ->
+            dot_generator:doc_generator ->
               unit
-            

diff --git a/ocamldoc/odoc_info.mli b/ocamldoc/odoc_info.mli
index 0dcfb4d4aaee6a57963c66fdb8bf5b79d3141dcd..1d215a526bb3a9b996b15d83e200c993345d4f08 100644 (file)
--- a/ocamldoc/odoc_info.mli
+++ b/ocamldoc/odoc_info.mli
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: odoc_info.mli,v 1.36.4.2 2004/08/06 13:42:16 guesdon Exp $ *)
+(* $Id: odoc_info.mli,v 1.36.4.3 2005/02/18 16:08:37 guesdon Exp $ *)
 
 (** Interface to the information collected in source files. *)
 
@@ -57,14 +57,14 @@ and text_element = Odoc_types.text_element =
 and text = text_element list
 
 (** The different forms of references in \@see tags. *)
-type see_ref = Odoc_types.see_ref = 
+type see_ref = Odoc_types.see_ref =
     See_url of string
   | See_file of string
   | See_doc of string
 
 (** Raised when parsing string to build a {!Odoc_info.text}
    structure. [(line, char, string)] *)
-exception Text_syntax of int * int * string 
+exception Text_syntax of int * int * string
 
 (** The information in a \@see tag. *)
 type see = see_ref * text
@@ -87,13 +87,13 @@ type info = Odoc_types.info = {
     i_raised_exceptions : raised_exception list; (** The list of raised exceptions. *)
     i_return_value : text option; (** The description text of the return value. *)
     i_custom : (string * text) list ; (** A text associated to a custom @-tag. *)
-  } 
+  }
 
 (** Location of elements in implementation and interface files. *)
 type location = Odoc_types.location = {
     loc_impl : (string * int) option ; (** implementation file name and position *)
     loc_inter : (string * int) option ; (** interface file name and position *)
-  } 
+  }
 
 (** A dummy location. *)
 val dummy_loc : location
@@ -130,9 +130,9 @@ module Parameter :
           sn_name : string ;
           sn_type : Types.type_expr ;
           mutable sn_text : text option ;
-        } 
+        }
 
-    (** Representation of parameter names. We need it to represent parameter names in tuples. 
+    (** Representation of parameter names. We need it to represent parameter names in tuples.
        The value [Tuple ([], t)] stands for an anonymous parameter.*)
     type param_info = Odoc_parameter.param_info =
         Simple_name of simple_name
@@ -156,55 +156,55 @@ module Parameter :
        @raise Not_found if no description is associated to the given name. *)
     val desc_by_name : parameter -> string -> text option
 
-    (** Access to the type of a specific name. 
+    (** Access to the type of a specific name.
        @raise Not_found if no type is associated to the given name. *)
     val type_by_name : parameter -> string -> Types.type_expr
   end
-   
+
 (** Representation and manipulation of exceptions. *)
 module Exception :
   sig
     (** Used when the exception is a rebind of another exception,
        when we have [exception Ex = Target_ex].*)
-    type exception_alias = Odoc_exception.exception_alias = 
+    type exception_alias = Odoc_exception.exception_alias =
         {
           ea_name : Name.t ; (** The complete name of the target exception. *)
           mutable ea_ex : t_exception option ; (** The target exception, if we found it.*)
-        } 
-          
+        }
+
     and t_exception = Odoc_exception.t_exception =
         {
           ex_name : Name.t ;
           mutable ex_info : info option ; (** Information found in the optional associated comment. *)
           ex_args : Types.type_expr list ; (** The types of the parameters. *)
           ex_alias : exception_alias option ; (** [None] when the exception is not a rebind. *)
-          mutable ex_loc : location ; 
+          mutable ex_loc : location ;
           mutable ex_code : string option ;
-        } 
+        }
   end
 
 (** Representation and manipulation of types.*)
 module Type :
   sig
     (** Description of a variant type constructor. *)
-    type variant_constructor = Odoc_type.variant_constructor = 
+    type variant_constructor = Odoc_type.variant_constructor =
         {
           vc_name : string ; (** Name of the constructor. *)
           vc_args : Types.type_expr list ; (** Arguments of the constructor. *)
           mutable vc_text : text option ; (** Optional description in the associated comment. *)
-        } 
+        }
 
     (** Description of a record type field. *)
-    type record_field = Odoc_type.record_field = 
+    type record_field = Odoc_type.record_field =
         {
           rf_name : string ; (** Name of the field. *)
           rf_mutable : bool ; (** [true] if mutable. *)
           rf_type : Types.type_expr ; (** Type of the field. *)
           mutable rf_text : text option ; (** Optional description in the associated comment.*)
-        } 
+        }
 
     (** The various kinds of a type. *)
-    type type_kind = Odoc_type.type_kind = 
+    type type_kind = Odoc_type.type_kind =
         Type_abstract (** Type is abstract, for example [type t]. *)
       | Type_variant of variant_constructor list * bool
                    (** constructors * bool *)
@@ -212,17 +212,17 @@ module Type :
                   (** fields * bool *)
 
     (** Representation of a type. *)
-    type t_type = Odoc_type.t_type = 
+    type t_type = Odoc_type.t_type =
         {
           ty_name : Name.t ; (** Complete name of the type. *)
           mutable ty_info : info option ; (** Information found in the optional associated comment. *)
-          ty_parameters : (Types.type_expr * bool * bool) list ; 
+          ty_parameters : (Types.type_expr * bool * bool) list ;
                     (** type parameters: (type, covariant, contravariant) *)
           ty_kind : type_kind ; (** Type kind. *)
           ty_manifest : Types.type_expr option; (** Type manifest. *)
           mutable ty_loc : location ;
           mutable ty_code : string option;
-        } 
+        }
 
   end
 
@@ -230,7 +230,7 @@ module Type :
 module Value :
   sig
     (** Representation of a value. *)
-    type t_value = Odoc_value.t_value = 
+    type t_value = Odoc_value.t_value =
         {
           val_name : Name.t ; (** Complete name of the value. *)
           mutable val_info : info option ; (** Information found in the optional associated comment. *)
@@ -239,23 +239,23 @@ module Value :
           mutable val_parameters : Odoc_parameter.parameter list ; (** The parameters, if any. *)
           mutable val_code : string option ; (** The code of the value, if we had the only the implementation file. *)
           mutable val_loc : location ;
-        } 
+        }
 
     (** Representation of a class attribute. *)
-    type t_attribute = Odoc_value.t_attribute = 
+    type t_attribute = Odoc_value.t_attribute =
         {
           att_value : t_value ; (** an attribute has almost all the same information as a value *)
           att_mutable : bool ;  (** [true] if the attribute is mutable. *)
         }
 
     (** Representation of a class method. *)
-    type t_method = Odoc_value.t_method = 
+    type t_method = Odoc_value.t_method =
         {
           met_value : t_value ; (** a method has almost all the same information as a value *)
           met_private : bool ;  (** [true] if the method is private.*)
           met_virtual : bool ;  (** [true] if the method is virtual. *)
-        } 
-          
+        }
+
     (** Return [true] if the value is a function, i.e. it has a functional type. *)
     val is_function : t_value -> bool
 
@@ -274,34 +274,34 @@ module Class :
       | Class_comment of text
 
     (** Used when we can reference a t_class or a t_class_type. *)
-    type cct = Odoc_class.cct = 
+    type cct = Odoc_class.cct =
         Cl of t_class
       | Cltype of t_class_type * Types.type_expr list (** Class type and type parameters. *)
 
-    and inherited_class = Odoc_class.inherited_class = 
+    and inherited_class = Odoc_class.inherited_class =
         {
           ic_name : Name.t ; (** Complete name of the inherited class. *)
           mutable ic_class : cct option ; (** The associated t_class or t_class_type. *)
           ic_text : text option ; (** The inheritance description, if any. *)
-        } 
+        }
 
-    and class_apply = Odoc_class.class_apply = 
+    and class_apply = Odoc_class.class_apply =
         {
           capp_name : Name.t ; (** The complete name of the applied class. *)
           mutable capp_class : t_class option;  (** The associated t_class if we found it. *)
           capp_params : Types.type_expr list; (** The type of expressions the class is applied to. *)
           capp_params_code : string list ; (** The code of these exprssions. *)
-        } 
-          
-    and class_constr = Odoc_class.class_constr = 
+        }
+
+    and class_constr = Odoc_class.class_constr =
         {
           cco_name : Name.t ; (** The complete name of the applied class. *)
-          mutable cco_class : cct option;  
+          mutable cco_class : cct option;
               (** The associated class or class type if we found it. *)
           cco_type_parameters : Types.type_expr list; (** The type parameters of the class, if needed. *)
-        } 
+        }
 
-    and class_kind = Odoc_class.class_kind = 
+    and class_kind = Odoc_class.class_kind =
         Class_structure of inherited_class list * class_element list
         (** An explicit class structure, used in implementation and interface. *)
       | Class_apply of class_apply
@@ -316,7 +316,7 @@ module Class :
         (** A class definition with a constraint. *)
 
     (** Representation of a class. *)
-    and t_class = Odoc_class.t_class = 
+    and t_class = Odoc_class.t_class =
         {
           cl_name : Name.t ; (** Complete name of the class. *)
           mutable cl_info : info option ; (** Information found in the optional associated comment. *)
@@ -326,21 +326,21 @@ module Class :
           mutable cl_kind : class_kind ; (** The way the class is defined. *)
           mutable cl_parameters : Parameter.parameter list ; (** The parameters of the class. *)
           mutable cl_loc : location ;
-        } 
+        }
 
-    and class_type_alias = Odoc_class.class_type_alias = 
+    and class_type_alias = Odoc_class.class_type_alias =
         {
           cta_name : Name.t ; (** Complete name of the target class type. *)
           mutable cta_class : cct option ;  (** The target t_class or t_class_type, if we found it.*)
           cta_type_parameters : Types.type_expr list ; (** The type parameters. A VOIR : mettre des string ? *)
-        } 
+        }
 
-    and class_type_kind = Odoc_class.class_type_kind = 
+    and class_type_kind = Odoc_class.class_type_kind =
         Class_signature of inherited_class list * class_element list
       | Class_type of class_type_alias (** A class type eventually applied to type args. *)
-            
+
     (** Representation of a class type. *)
-    and t_class_type = Odoc_class.t_class_type = 
+    and t_class_type = Odoc_class.t_class_type =
         {
           clt_name : Name.t ; (** Complete name of the type. *)
           mutable clt_info : info option ; (** Information found in the optional associated comment. *)
@@ -349,7 +349,7 @@ module Class :
           clt_virtual : bool ; (** [true] if the class type is virtual *)
           mutable clt_kind : class_type_kind ; (** The way the class type is defined. *)
           mutable clt_loc : location ;
-        } 
+        }
 
     (** {3 Functions} *)
 
@@ -389,7 +389,7 @@ module Module :
   sig
     (** {3 Types} *)
     (** To keep the order of elements in a module. *)
-    type module_element = Odoc_module.module_element = 
+    type module_element = Odoc_module.module_element =
         Element_module of t_module
       | Element_module_type of t_module_type
       | Element_included_module of included_module
@@ -405,36 +405,36 @@ module Module :
       | Mod of t_module
       | Modtype of t_module_type
 
-    and included_module = Odoc_module.included_module = 
+    and included_module = Odoc_module.included_module =
         {
           im_name : Name.t ; (** Complete name of the included module. *)
           mutable im_module : mmt option ; (** The included module or module type, if we found it. *)
          mutable im_info : Odoc_types.info option ; (** comment associated to the includ directive *)
-        } 
-          
-    and module_alias = Odoc_module.module_alias = 
+        }
+
+    and module_alias = Odoc_module.module_alias =
         {
           ma_name : Name.t ; (** Complete name of the target module. *)
           mutable ma_module : mmt option ; (** The real module or module type if we could associate it. *)
-        } 
+        }
 
     and module_parameter = Odoc_module.module_parameter = {
        mp_name : string ; (** the name *)
        mp_type : Types.module_type ; (** the type *)
        mp_type_code : string ; (** the original code *)
        mp_kind : module_type_kind ; (** the way the parameter was built *)
-      } 
+      }
 
     (** Different kinds of a module. *)
-    and module_kind = Odoc_module.module_kind = 
+    and module_kind = Odoc_module.module_kind =
       | Module_struct of module_element list (** A complete module structure. *)
       | Module_alias of module_alias (** Complete name and corresponding module if we found it *)
-      | Module_functor of module_parameter * module_kind 
+      | Module_functor of module_parameter * module_kind
                      (** A functor, with its parameter and the rest of its definition *)
       | Module_apply of module_kind * module_kind
                      (** A module defined by application of a functor. *)
       | Module_with of module_type_kind * string
-                     (** A module whose type is a with ... constraint. 
+                     (** A module whose type is a with ... constraint.
                         Should appear in interface files only. *)
       | Module_constraint of module_kind * module_type_kind
                      (** A module constraint by a module type. *)
@@ -452,16 +452,16 @@ module Module :
           mutable m_top_deps : Name.t list ; (** The toplevels module names this module depends on. *)
          mutable m_code : string option ; (** The whole code of the module *)
          mutable m_code_intf : string option ; (** The whole code of the interface of the module *)
-        } 
+        }
 
     and module_type_alias = Odoc_module.module_type_alias =
         {
           mta_name : Name.t ; (** Complete name of the target module type. *)
           mutable mta_module : t_module_type option ; (** The real module type if we could associate it. *)
-        } 
+        }
 
     (** Different kinds of module type. *)
-    and module_type_kind = Odoc_module.module_type_kind = 
+    and module_type_kind = Odoc_module.module_type_kind =
       | Module_type_struct of module_element list (** A complete module signature. *)
       | Module_type_functor of module_parameter * module_type_kind
             (** A functor, with its parameter and the rest of its definition *)
@@ -478,12 +478,12 @@ module Module :
           mt_type : Types.module_type option ; (** [None] means that the module type is abstract. *)
           mt_is_interface : bool ; (** [true] for modules read from interface files. *)
           mt_file : string ; (** The file the module type is defined in. *)
-          mutable mt_kind : module_type_kind option ; 
+          mutable mt_kind : module_type_kind option ;
               (** The way the module is defined. [None] means that module type is abstract.
                  It is always [None] when the module type was extracted from the implementation file.
                  That means module types are only analysed in interface files. *)
           mutable mt_loc : location ;
-        } 
+        }
 
     (** {3 Functions for modules} *)
 
@@ -582,10 +582,10 @@ module Module :
 
 
 (** {3 Getting strings from values} *)
-    
+
 (** This function is used to reset the names of type variables.
    It must be called when printing the whole type of a function,
-   but not when printing the type of its parameters. Same for 
+   but not when printing the type of its parameters. Same for
    classes (call it) and methods and attributes (don't call it).*)
 val reset_type_names : unit -> unit
 
@@ -611,12 +611,12 @@ val string_of_type_list : ?par: bool -> string -> Types.type_expr list -> string
    for the given type. *)
 val string_of_type_param_list : Type.t_type -> string
 
-(** This function returns a string to represent the given list of 
+(** This function returns a string to represent the given list of
    type parameters of a class or class type,
    with a given separator. *)
 val string_of_class_type_param_list : Types.type_expr list -> string
 
-(** This function returns a string representing a [Types.module_type]. 
+(** This function returns a string representing a [Types.module_type].
    @param complete indicates if we must print complete signatures
    or just [sig end]. Default if [false].
    @param code if [complete = false] and the type contains something else
@@ -624,7 +624,7 @@ val string_of_class_type_param_list : Types.type_expr list -> string
 *)
 val string_of_module_type : ?code: string -> ?complete: bool -> Types.module_type -> string
 
-(** This function returns a string representing a [Types.class_type]. 
+(** This function returns a string representing a [Types.class_type].
    @param complete indicates if we must print complete signatures
    or just [object end]. Default if [false].
 *)
@@ -673,12 +673,12 @@ val text_no_title_no_list : text -> text
    the text [sep]. *)
 val text_concat : Odoc_types.text -> Odoc_types.text list -> Odoc_types.text
 
-(** Return the list of titles in a [text]. 
+(** Return the list of titles in a [text].
    A title is a title level, an optional label and a text.*)
 val get_titles_in_text : text -> (int * string option * text) list
 
 (** Take a sorted list of elements, a function to get the name
-   of an element and return the list of list of elements, 
+   of an element and return the list of list of elements,
    where each list group elements beginning by the same letter.
    Since the original list is sorted, elements whose name does not
    begin with a letter should be in the first returned list.*)
@@ -696,16 +696,16 @@ val is_optional : string -> bool
    i.e. removes the beginning '?' if present.*)
 val label_name : string -> string
 
-(** Return the given name where the module name or 
-   part of it was removed, according to the list of modules 
+(** Return the given name where the module name or
+   part of it was removed, according to the list of modules
    which must be hidden (cf {!Odoc_args.hidden_modules})*)
 val use_hidden_modules : Name.t -> Name.t
- 
+
 (** Print the given string if the verbose mode is activated. *)
 val verbose : string -> unit
 
 (** Print a warning message to stderr.
-   If warnings must be treated as errors, then the 
+   If warnings must be treated as errors, then the
    error counter is incremented. *)
 val warning : string -> unit
 
@@ -718,23 +718,23 @@ val errors : int ref
 (** Apply a function to an optional value. *)
 val apply_opt : ('a -> 'b) -> 'a option -> 'b option
 
-(** Apply a function to a first value if it is 
+(** Apply a function to a first value if it is
    not different from a second value. If the two values
    are different, return the second one.*)
 val apply_if_equal : ('a -> 'a) -> 'a -> 'a -> 'a
 
 (** [text_of_string s] returns the text structure from the
-   given string. 
+   given string.
    @raise Text_syntax if a syntax error is encountered. *)
 val text_of_string : string -> text
 
 (** [text_string_of_text text] returns the string representing
    the given [text]. This string can then be parsed again
-   by {!Odoc_info.text_of_string}.*)   
+   by {!Odoc_info.text_of_string}.*)
 val text_string_of_text : text -> string
 
 (** [info_of_string s] parses the given string
-   like a regular ocamldoc comment and return an 
+   like a regular ocamldoc comment and return an
    {!Odoc_info.info} structure.
    @return an empty structure if there was a syntax error. TODO: change this
 *)
@@ -742,11 +742,11 @@ val info_of_string : string -> info
 
 (** [info_string_of_info info] returns the string representing
    the given [info]. This string can then be parsed again
-   by {!Odoc_info.info_of_string}.*)   
+   by {!Odoc_info.info_of_string}.*)
 val info_string_of_info : info -> string
 
 (** [info_of_comment_file file] parses the given file
-   and return an {!Odoc_info.info} structure. The content of the 
+   and return an {!Odoc_info.info} structure. The content of the
    file must have the same syntax as the content of a special comment.
    @raise Failure is the file could not be opened or there is a
    syntax error.
@@ -819,14 +819,14 @@ module Scan :
         method scan_attribute : Value.t_attribute -> unit
         method scan_method : Value.t_method -> unit
         method scan_included_module : Module.included_module -> unit
-            
-      (** Scan of a class. *)    
+
+      (** Scan of a class. *)
 
         (** Scan of a comment inside a class. *)
         method scan_class_comment : text -> unit
 
        (** Override this method to perform controls on the class comment
-          and params. This method is called before scanning the class elements. 
+          and params. This method is called before scanning the class elements.
           @return true if the class elements must be scanned.*)
         method scan_class_pre : Class.t_class -> bool
 
@@ -843,7 +843,7 @@ module Scan :
         method scan_class_type_comment : text -> unit
 
         (** Override this method to perform controls on the class type comment
-           and form. This method is called before scanning the class type elements. 
+           and form. This method is called before scanning the class type elements.
            @return true if the class type elements must be scanned.*)
         method scan_class_type_pre : Class.t_class_type -> bool
 
@@ -860,7 +860,7 @@ module Scan :
         method scan_module_comment : text -> unit
 
         (** Override this method to perform controls on the module comment
-           and form. This method is called before scanning the module elements. 
+           and form. This method is called before scanning the module elements.
            @return true if the module elements must be scanned.*)
         method scan_module_pre : Module.t_module -> bool
 
@@ -877,7 +877,7 @@ module Scan :
         method scan_module_type_comment : text -> unit
 
         (** Override this method to perform controls on the module type comment
-           and form. This method is called before scanning the module type elements. 
+           and form. This method is called before scanning the module type elements.
            @return true if the module type elements must be scanned. *)
         method scan_module_type_pre : Module.t_module_type -> bool
 
@@ -929,13 +929,13 @@ module Args :
 
       (** Verbose mode or not. *)
       val verbose : bool ref
-    
+
       (** The optional title to use in the generated documentation. *)
       val title : string option ref
 
       (** To keep the code while merging, when we have both .ml and .mli files for a module. *)
       val keep_code : bool ref
-    
+
       (** The optional file whose content can be used as intro text. *)
       val intro_file : string option ref
 
@@ -948,7 +948,7 @@ module Args :
 
       (** The directory where files have to be generated. *)
       val target_dir : string ref
-    
+
       (** An optional file to use where a CSS style is defined (for HTML). *)
       val css_style : string option ref
 
@@ -960,10 +960,10 @@ module Args :
 
       (** The flag which indicates if we must generate a header (for LaTeX). *)
       val with_header : bool ref
-    
+
       (** The flag which indicates if we must generate a trailer (for LaTeX). *)
       val with_trailer : bool ref
-    
+
       (** The flag to indicate if we must generate one file per module (for LaTeX). *)
       val separate_files : bool ref
 
@@ -1027,15 +1027,18 @@ module Args :
       (** The suffix for man pages. *)
       val man_suffix : string ref
 
+      (** The section for man pages. *)
+      val man_section : string ref
+
       (** The flag to generate all man pages or only for modules and classes.*)
       val man_mini : bool ref
 
       (** The files to be analysed. *)
       val files : source_file list ref
-    
+
       (** To set the documentation generator. *)
       val set_doc_generator : doc_generator option -> unit
-    
+
       (** Add an option specification. *)
       val add_option : string * Arg.spec * string -> unit
     end
@@ -1053,10 +1056,10 @@ val analyse_files :
                 Args.source_file list ->
                   Module.t_module list
 
-(** Dump of a list of modules into a file. 
+(** Dump of a list of modules into a file.
    @raise Failure if an error occurs.*)
 val dump_modules : string -> Odoc_module.t_module list -> unit
 
-(** Load of a list of modules from a file. 
+(** Load of a list of modules from a file.
    @raise Failure if an error occurs.*)
 val load_modules : string -> Odoc_module.t_module list

diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml
index b4ed905de1d9c252184bc143f82c4640fe72460b..fd16f206989966d6b13e261ab783ecefa3d7460f 100644 (file)
--- a/ocamldoc/odoc_man.ml
+++ b/ocamldoc/odoc_man.ml
@@ -9,15 +9,15 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: odoc_man.ml,v 1.22 2004/05/23 10:41:50 guesdon Exp $ *)
+(* $Id: odoc_man.ml,v 1.22.4.1 2005/02/18 16:08:37 guesdon Exp $ *)
 
 (** The man pages generator. *)
-open Odoc_info 
+open Odoc_info
 open Parameter
 open Value
 open Type
 open Exception
-open Class 
+open Class
 open Module
 open Search
 
@@ -29,7 +29,7 @@ let bs = Buffer.add_string
 class virtual info =
   object (self)
     (** The list of pairs [(tag, f)] where [f] is a function taking
-       the [text] associated to [tag] and returning man code. 
+       the [text] associated to [tag] and returning man code.
        Add a pair here to handle a tag.*)
     val mutable tag_functions = ([] : (string * (Odoc_info.text -> string)) list)
 
@@ -51,7 +51,7 @@ class virtual info =
     method man_of_version_opt b v_opt =
       match v_opt with
         None -> ()
-      | Some v -> 
+      | Some v ->
          bs b ".B \"";
          bs b Odoc_messages.version;
          bs b "\"\n:\n";
@@ -62,7 +62,7 @@ class virtual info =
     method man_of_since_opt b s_opt =
       match s_opt with
         None -> ()
-      | Some s -> 
+      | Some s ->
          bs b ".B \"";
          bs b Odoc_messages.since;
          bs b "\"\n";
@@ -73,7 +73,7 @@ class virtual info =
     method man_of_raised_exceptions b l =
       match l with
         [] -> ()
-      | (s, t) :: [] -> 
+      | (s, t) :: [] ->
          bs b ".B \"";
          bs b Odoc_messages.raises;
          bs b (" "^s^"\"\n");
@@ -84,7 +84,7 @@ class virtual info =
          bs b Odoc_messages.raises;
          bs b "\"\n";
           List.iter
-            (fun (ex, desc) -> 
+            (fun (ex, desc) ->
              bs b ".TP\n.B \"";
              bs b ex;
              bs b "\"\n";
@@ -96,7 +96,7 @@ class virtual info =
 
     (** Print groff string for the given "see also" reference. *)
     method man_of_see b (see_ref, t)  =
-      let t_ref = 
+      let t_ref =
         match see_ref with
           Odoc_info.See_url s -> [ Odoc_info.Link (s, t) ]
         | Odoc_info.See_file s -> (Odoc_info.Code s) :: (Odoc_info.Raw " ") :: t
@@ -108,7 +108,7 @@ class virtual info =
     method man_of_sees b l =
       match l with
         [] -> ()
-      | see :: [] -> 
+      | see :: [] ->
          bs b ".B \"";
          bs b Odoc_messages.see_also;
          bs b "\"\n";
@@ -119,7 +119,7 @@ class virtual info =
          bs b Odoc_messages.see_also;
          bs b "\"\n";
          List.iter
-            (fun see -> 
+            (fun see ->
              bs b ".TP\n \"\"\n";
              self#man_of_see b see;
              bs b "\n"
@@ -131,7 +131,7 @@ class virtual info =
     method man_of_return_opt b return_opt =
       match return_opt with
         None -> ()
-      | Some s -> 
+      | Some s ->
          bs b ".B ";
          bs b Odoc_messages.returns;
          bs b "\n";
@@ -161,7 +161,7 @@ class virtual info =
           (
           match info.M.i_deprecated with
              None -> ()
-           | Some d -> 
+           | Some d ->
               bs b ".B \"";
               bs b Odoc_messages.deprecated;
               bs b "\"\n";
@@ -172,7 +172,7 @@ class virtual info =
           match info.M.i_desc with
              None -> ()
            | Some d when d = [Odoc_info.Raw ""] -> ()
-           | Some d -> 
+           | Some d ->
               self#man_of_text b d;
               bs b "\n.sp\n"
           );
@@ -192,7 +192,7 @@ class man =
     inherit info
 
     (** Get a file name from a complete name. *)
-    method file_name name = 
+    method file_name name =
       let s = Printf.sprintf "%s.%s" name !Args.man_suffix in
       Str.global_replace re_slash "slash" s
 
@@ -203,9 +203,9 @@ class man =
     method open_out file =
       let f = Filename.concat !Args.target_dir file in
       open_out f
-      
+
     (** Print groff string for a text, without correction of blanks. *)
-    method private man_of_text2 b t = 
+    method private man_of_text2 b t =
       List.iter (self#man_of_text_element b) t
 
     (** Print the groff string for a text, with blanks corrected. *)
@@ -219,25 +219,25 @@ class man =
     (** Return the given string without no newlines. *)
     method remove_newlines s =
       Str.global_replace (Str.regexp "[ ]*\n[ ]*") " " s
-      
+
     (** Print the groff string for a text element. *)
     method man_of_text_element b te =
       match te with
       | Odoc_info.Raw s -> bs b s
-      | Odoc_info.Code s -> 
+      | Odoc_info.Code s ->
           bs b "\n.B ";
          bs b ((Str.global_replace (Str.regexp "\n") "\n.B " (self#escape s))^"\n")
-      | Odoc_info.CodePre s -> 
+      | Odoc_info.CodePre s ->
           bs b "\n.B ";
          bs b ((Str.global_replace (Str.regexp "\n") "\n.B " (self#escape s))^"\n")
-      | Odoc_info.Verbatim s -> 
+      | Odoc_info.Verbatim s ->
          bs b (self#escape s)
       | Odoc_info.Bold t
       | Odoc_info.Italic t
       | Odoc_info.Emphasize t
       | Odoc_info.Center t
       | Odoc_info.Left t
-      | Odoc_info.Right t -> 
+      | Odoc_info.Right t ->
          self#man_of_text2 b t
       | Odoc_info.List tl ->
           List.iter
@@ -271,19 +271,19 @@ class man =
           bs b "_{"; self#man_of_text2 b t
       |        Odoc_info.Module_list _ ->
          ()
-      |        Odoc_info.Index_list -> 
+      |        Odoc_info.Index_list ->
          ()
 
     (** Print groff string to display code. *)
     method man_of_code b s = self#man_of_text b [ Code s ]
 
-    (** Take a string and return the string where fully qualified idents 
+    (** Take a string and return the string where fully qualified idents
        have been replaced by idents relative to the given module name.*)
     method relative_idents m_name s =
-      let f str_t = 
+      let f str_t =
         let match_s = Str.matched_string str_t in
-        Odoc_info.apply_if_equal 
-          Odoc_info.use_hidden_modules 
+        Odoc_info.apply_if_equal
+          Odoc_info.use_hidden_modules
           match_s
           (Name.get_relative m_name match_s)
       in
@@ -363,18 +363,18 @@ class man =
       (
        match e.ex_args with
          [] -> ()
-       | _ -> 
+       | _ ->
            bs b ".B of ";
-           self#man_of_type_expr_list 
+           self#man_of_type_expr_list
             ~par: false
             b (Name.father e.ex_name) " * " e.ex_args
       );
       (
        match e.ex_alias with
          None -> ()
-       | Some ea -> 
+       | Some ea ->
           bs b " = ";
-           bs b 
+           bs b
             (
               match ea.ea_ex with
                None -> ea.ea_name
@@ -392,37 +392,37 @@ class man =
       bs b ".I type ";
       self#man_of_type_expr_param_list b father t;
       (
-       match t.ty_parameters with 
-        [] -> () 
+       match t.ty_parameters with
+        [] -> ()
        | _ -> bs b ".I "
       );
       bs b (Name.simple t.ty_name);
       bs b " \n";
       (
-       match t.ty_manifest with 
-        None -> () 
-       | Some typ -> 
+       match t.ty_manifest with
+        None -> ()
+       | Some typ ->
           bs b "= ";
           self#man_of_type_expr b father typ
       );
       (
        match t.ty_kind with
-        Type_abstract -> ()       
+        Type_abstract -> ()
       | Type_variant (l, priv) ->
           bs b "=";
          if priv then bs b " private";
          bs b "\n ";
-          List.iter 
+          List.iter
             (fun constr ->
               bs b ("| "^constr.vc_name);
               (
               match constr.vc_args, constr.vc_text with
-                 [], None -> bs b "\n " 
-               | [], (Some t) -> 
+                 [], None -> bs b "\n "
+               | [], (Some t) ->
                   bs b "  (* ";
                   self#man_of_text b t;
                   bs b " *)\n "
-               | l, None -> 
+               | l, None ->
                    bs b "\n.B of ";
                   self#man_of_type_expr_list ~par: false b father " * " l;
                   bs b " "
@@ -440,7 +440,7 @@ class man =
           bs b "= ";
          if priv then bs b "private ";
          bs b "{";
-          List.iter 
+          List.iter
             (fun r ->
               bs b (if r.rf_mutable then "\n\n.B mutable \n" else "\n ");
               bs b (r.rf_name^" : ");
@@ -478,7 +478,7 @@ class man =
       if m.met_private then bs b "private ";
       if m.met_virtual then bs b "virtual ";
       bs b ((Name.simple m.met_value.val_name)^" : ");
-      self#man_of_type_expr b 
+      self#man_of_type_expr b
        (Name.father m.met_value.val_name) m.met_value.val_type;
       bs b "\n.sp\n";
       self#man_of_info b m.met_value.val_info;
@@ -523,7 +523,7 @@ class man =
             (fun n ->
               match Parameter.desc_by_name p n with
                 None -> ()
-              | Some t -> 
+              | Some t ->
                  self#man_of_code b (n^" : ");
                  self#man_of_text b t
             )
@@ -562,7 +562,7 @@ class man =
       (
        match c.cl_type_parameters with
          [] -> ()
-       | l -> 
+       | l ->
           bs b (Odoc_str.string_of_class_type_param_list l);
           bs b " "
       );
@@ -581,14 +581,14 @@ class man =
       (
        match ct.clt_type_parameters with
         [] -> ()
-      | l -> 
+      | l ->
          bs b (Odoc_str.string_of_class_type_param_list l);
          bs b " "
       );
       bs b (Name.simple ct.clt_name);
       bs b  " = " ;
       self#man_of_class_type_expr b (Name.father ct.clt_name) ct.clt_type;
-      bs b  "\n.sp\n"; 
+      bs b  "\n.sp\n";
       self#man_of_info b ct.clt_info;
       bs b "\n.sp\n"
 
@@ -607,9 +607,9 @@ class man =
       bs b ".I module type ";
       bs b (Name.simple mt.mt_name);
       bs b " = ";
-      (match mt.mt_type with 
+      (match mt.mt_type with
         None -> ()
-      | Some t -> 
+      | Some t ->
          self#man_of_module_type b (Name.father mt.mt_name) t
       );
       bs b "\n.sp\n";
@@ -635,7 +635,7 @@ class man =
        match im.im_module with
          None -> bs b im.im_name
        | Some mmt ->
-           let name = 
+           let name =
              match mmt with
                Mod m -> m.m_name
              | Modtype mt -> mt.mt_name
@@ -654,14 +654,13 @@ class man =
       try
         let chanout = self#open_out file in
        let b = new_buf () in
-       bs b ".TH \"";
-       bs b Odoc_messages.clas; 
-       bs b ("\" "^cl.cl_name^" ");
-        bs b ("\""^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
+       bs b (".TH \""^cl.cl_name^"\" ");
+        bs b !Odoc_args.man_section ;
+        bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
         bs b "OCamldoc ";
         bs b ("\""^(match !Args.title with Some t -> t | None -> "")^"\"\n");
 
-       let abstract = 
+       let abstract =
          match cl.cl_info with
            None | Some { i_desc = None } -> "no description"
          | Some { i_desc = Some t } ->
@@ -687,7 +686,7 @@ class man =
         self#generate_class_inheritance_info chanout cl;
 *)
         (* the various elements *)
-        List.iter 
+        List.iter
           (fun element ->
             match element with
               Class_attribute a ->
@@ -714,13 +713,13 @@ class man =
       try
         let chanout = self#open_out file in
        let b = new_buf () in
-       bs b (".TH \""^Odoc_messages.class_type^"\" ");
-        bs b (ct.clt_name^" ");
-        bs b ("\""^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
+       bs b (".TH \""^ct.clt_name^"\" ");
+        bs b !Odoc_args.man_section ;
+        bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
         bs b "OCamldoc ";
         bs b ("\""^(match !Args.title with Some t -> t | None -> "")^"\"\n");
 
-       let abstract = 
+       let abstract =
          match ct.clt_info with
            None | Some { i_desc = None } -> "no description"
          | Some { i_desc = Some t } ->
@@ -734,7 +733,7 @@ class man =
         bs b (Odoc_messages.class_type^"   "^ct.clt_name^"\n");
         bs b (".SH "^Odoc_messages.documentation^"\n");
         bs b ".sp\n";
-        
+
        self#man_of_class_type b ct;
 
         (* a large blank *)
@@ -744,7 +743,7 @@ class man =
         self#generate_class_inheritance_info chanout cl;
 *)
         (* the various elements *)
-        List.iter 
+        List.iter
           (fun element ->
             match element with
               Class_attribute a ->
@@ -763,7 +762,7 @@ class man =
           incr Odoc_info.errors ;
           prerr_endline s
 
-    (** Generate the man file for the given module type. 
+    (** Generate the man file for the given module type.
        @raise Failure if an error occurs.*)
     method generate_for_module_type mt =
       let date = Unix.time () in
@@ -771,13 +770,13 @@ class man =
       try
         let chanout = self#open_out file in
        let b = new_buf () in
-       bs b (".TH \""^Odoc_messages.module_type^"\" ");
-        bs b (mt.mt_name^" ");
-        bs b ("\""^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
+       bs b (".TH \""^mt.mt_name^"\" ");
+        bs b !Odoc_args.man_section ;
+        bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
         bs b "OCamldoc ";
         bs b ("\""^(match !Args.title with Some t -> t | None -> "")^"\"\n");
 
-       let abstract = 
+       let abstract =
          match mt.mt_info with
            None | Some { i_desc = None } -> "no description"
          | Some { i_desc = Some t } ->
@@ -796,7 +795,7 @@ class man =
         (
         match mt.mt_type with
            None -> ()
-         | Some t -> 
+         | Some t ->
             self#man_of_module_type b (Name.father mt.mt_name) t
         );
         bs b "\n.sp\n";
@@ -809,7 +808,7 @@ class man =
         bs b "\n.sp\n.sp\n";
 
         (* module elements *)
-        List.iter 
+        List.iter
           (fun ele ->
             match ele with
               Element_module m ->
@@ -841,7 +840,7 @@ class man =
           incr Odoc_info.errors ;
           prerr_endline s
 
-    (** Generate the man file for the given module. 
+    (** Generate the man file for the given module.
        @raise Failure if an error occurs.*)
     method generate_for_module m =
       let date = Unix.time () in
@@ -849,15 +848,13 @@ class man =
       try
         let chanout = self#open_out file in
        let b = new_buf () in
-        bs b ".TH \"";
-       bs b Odoc_messages.modul;
-       bs b "\" ";
-        bs b (m.m_name^" ");
-        bs b ("\""^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
+       bs b (".TH \""^m.m_name^"\" ");
+        bs b !Odoc_args.man_section ;
+        bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
         bs b "OCamldoc ";
         bs b ("\""^(match !Args.title with Some t -> t | None -> "")^"\"\n");
 
-       let abstract = 
+       let abstract =
          match m.m_info with
            None | Some { i_desc = None } -> "no description"
          | Some { i_desc = Some t } ->
@@ -885,7 +882,7 @@ class man =
         bs b "\n.sp\n.sp\n";
 
         (* module elements *)
-        List.iter 
+        List.iter
           (fun ele ->
             match ele with
               Element_module m ->
@@ -918,7 +915,7 @@ class man =
 
     (** Create the groups of elements to generate pages for. *)
     method create_groups module_list =
-      let name res_ele = 
+      let name res_ele =
         match res_ele with
           Res_module m -> m.m_name
         | Res_module_type mt -> mt.mt_name
@@ -932,33 +929,33 @@ class man =
         | Res_section _ -> assert false
       in
       let all_items_pre = Odoc_info.Search.search_by_name module_list (Str.regexp ".*")  in
-      let all_items = List.filter 
+      let all_items = List.filter
           (fun r -> match r with Res_section _ -> false | _ -> true)
           all_items_pre
       in
       let sorted_items = List.sort (fun e1 -> fun e2 -> compare (name e1) (name e2)) all_items in
-      let rec f acc1 acc2 l = 
+      let rec f acc1 acc2 l =
         match l with
           [] -> acc2 :: acc1
         | h :: q ->
             match acc2 with
               [] -> f acc1 [h] q
-            | h2 :: q2 -> 
+            | h2 :: q2 ->
                 if (name h) = (name h2) then
                   if List.mem h acc2 then
                     f acc1 acc2 q
                   else
-                    f acc1 (acc2 @ [h]) q 
+                    f acc1 (acc2 @ [h]) q
                 else
                   f (acc2 :: acc1) [h] q
       in
       f [] [] sorted_items
 
-    (** Generate a man page for a group of elements with the same name. 
+    (** Generate a man page for a group of elements with the same name.
        A group must not be empty.*)
     method generate_for_group l =
-     let name = 
-       Name.simple 
+     let name =
+       Name.simple
          (
           match List.hd l with
             Res_module m -> m.m_name
@@ -978,9 +975,9 @@ class man =
       try
         let chanout = self#open_out file in
        let b = new_buf () in
-        bs b (".TH \""^name^"\" ");
-        bs b "man ";
-        bs b ("\""^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
+       bs b (".TH \""^name^"\" ");
+        bs b !Odoc_args.man_section ;
+        bs b (" "^(Odoc_misc.string_of_date ~hour: false date)^"\" ");
         bs b "OCamldoc ";
         bs b ("\""^(match !Args.title with Some t -> t | None -> "")^"\"\n");
        bs b ".SH NAME\n";
@@ -1025,7 +1022,7 @@ class man =
     method generate module_list =
       let sorted_module_list = Sort.list (fun m1 -> fun m2 -> m1.m_name < m2.m_name) module_list in
       let groups = self#create_groups sorted_module_list in
-      let f group = 
+      let f group =
         match group with
           [] ->
             ()
@@ -1034,10 +1031,10 @@ class man =
         | [Res_class cl] -> self#generate_for_class cl
         | [Res_class_type ct] -> self#generate_for_class_type ct
         | l ->
-            if !Args.man_mini then 
+            if !Args.man_mini then
               ()
             else
               self#generate_for_group l
       in
-      List.iter f groups 
+      List.iter f groups
   end

diff --git a/ocamldoc/odoc_messages.ml b/ocamldoc/odoc_messages.ml
index 27369325c5a9bbd6ada878e5cf17099620fb7807..3bfb83718953408808bcc25a52bdfbff80115b0e 100644 (file)
--- a/ocamldoc/odoc_messages.ml
+++ b/ocamldoc/odoc_messages.ml
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: odoc_messages.ml,v 1.24.4.3 2004/08/06 13:42:16 guesdon Exp $ *)
+(* $Id: odoc_messages.ml,v 1.24.4.4 2005/02/18 16:08:37 guesdon Exp $ *)
 
 (** The messages of the application. *)
 
@@ -60,37 +60,41 @@ let generate_dot = "\t\tGenerate dot code of top modules dependencies"
 let option_not_in_native_code op = "Option "^op^" not available in native code version."
 
 let default_out_file = "ocamldoc.out"
-let out_file = 
+let out_file =
   "<file>\tSet the ouput file name, used by texi, latex and dot generators\n"^
   "\t\t(default is "^default_out_file^")"
 
-let dot_include_all = 
+let dot_include_all =
   "\n\t\tInclude all modules in the dot output, not only the\n"^
   "\t\tmodules given on the command line"
 let dot_types = "\tGenerate dependency graph for types instead of modules"
-let default_dot_colors = 
+let default_dot_colors =
   [ [ "darkturquoise" ; "darkgoldenrod2" ; "cyan" ; "green" ; ] ;
     [ "magenta" ; "yellow" ; "burlywood1" ; "aquamarine" ; "floralwhite" ; "lightpink" ] ;
     [ "lightblue" ; "mediumturquoise" ; "salmon" ; "slategray3"] ;
-  ] 
+  ]
 
-let dot_colors = 
+let dot_colors =
   "<c1,c2,...,cn>\n\t\tUse colors c1,c1,...,cn in the dot output\n"^
   "\t\t(default list is "^
   (String.concat ",\n\t\t" (List.map (String.concat ", ") default_dot_colors))^")"
 
-let dot_reduce = 
+let dot_reduce =
   "\tPerform a transitive reduction on the selected dependency graph\n"^
   "\t\tbefore the dot output"
 
 let man_mini = "\tGenerate man pages only for modules, module types, classes\n"^
   "\t\tand class types "^man_only
-let default_man_suffix = "o"
+let default_man_section = "3"
+let man_section = "<section>\n\t\tUse <section> in man page files "^
+  "(default is "^default_man_section^") "^man_only^"\n"
+
+let default_man_suffix = default_man_section^"o"
 let man_suffix = "<suffix>\n\t\tUse <suffix> for man page files "^
   "(default is "^default_man_suffix^") "^man_only^"\n"
 
 let option_title = "<title>\tUse <title> as title for the generated documentation"
-let option_intro = 
+let option_intro =
   "<file>\tUse content of <file> as ocamldoc text to use as introduction\n"^
   "\t\t"^(html_latex_texi_only)
 let with_parameter_list = "\tDisplay the complete list of parameters for functions and\n"^
@@ -99,7 +103,7 @@ let hide_modules = "<M1,M2.M3,...>\n\t\tHide the given complete module names in
 let no_header = "\tSuppress header in generated documentation\n\t\t"^latex_texi_only
 let no_trailer = "\tSuppress trailer in generated documentation\n\t\t"^latex_texi_only
 let separate_files = "\tGenerate one file per toplevel module "^latex_only
-let latex_title ref_titles = 
+let latex_title ref_titles =
   "n,style\n\t\tAssociate {n } to the given sectionning style\n"^
   "\t\t(e.g. 'section') in the latex output "^latex_only^"\n"^
   "\t\tDefault sectionning is:\n\t\t"^
@@ -107,47 +111,47 @@ let latex_title ref_titles =
      (List.map (fun (n,t) -> Printf.sprintf " %d -> %s" n t) !ref_titles))
 
 let default_latex_value_prefix = "val:"
-let latex_value_prefix = 
+let latex_value_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of values.\n"^
   "\t\t(default is \""^default_latex_value_prefix^"\")"
 
 let default_latex_type_prefix = "type:"
-let latex_type_prefix = 
+let latex_type_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of types.\n"^
   "\t\t(default is \""^default_latex_type_prefix^"\")"
 
 let default_latex_exception_prefix = "exception:"
-let latex_exception_prefix = 
+let latex_exception_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of exceptions.\n"^
   "\t\t(default is \""^default_latex_exception_prefix^"\")"
 
 let default_latex_module_prefix = "module:"
-let latex_module_prefix = 
+let latex_module_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of modules.\n"^
   "\t\t(default is \""^default_latex_module_prefix^"\")"
 
 let default_latex_module_type_prefix = "moduletype:"
-let latex_module_type_prefix = 
+let latex_module_type_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of module types.\n"^
   "\t\t(default is \""^default_latex_module_type_prefix^"\")"
 
 let default_latex_class_prefix = "class:"
-let latex_class_prefix = 
+let latex_class_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of classes.\n"^
   "\t\t(default is \""^default_latex_class_prefix^"\")"
 
 let default_latex_class_type_prefix = "classtype:"
-let latex_class_type_prefix = 
+let latex_class_type_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of class types.\n"^
   "\t\t(default is \""^default_latex_class_type_prefix^"\")"
 
 let default_latex_attribute_prefix = "val:"
-let latex_attribute_prefix = 
+let latex_attribute_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of attributes.\n"^
   "\t\t(default is \""^default_latex_attribute_prefix^"\")"
 
 let default_latex_method_prefix = "method:"
-let latex_method_prefix = 
+let latex_method_prefix =
   "<string>\n\t\tUse <string> as prefix for the LaTeX labels of methods.\n"^
   "\t\t(default is \""^default_latex_method_prefix^"\")"
 
@@ -176,12 +180,12 @@ let info_section = "Specify section of Info directory "^texi_only
 let info_entry = "\tSpecify Info directory entry "^texi_only
 
 let options_can_be = "<options> can be one or more of the following characters:"
-let string_of_options_list l = 
+let string_of_options_list l =
   List.fold_left (fun acc -> fun (c, m) -> acc^"\n\t\t"^(String.make 1 c)^"  "^m)
     ""
     l
 
-let merge_options = 
+let merge_options =
   "<options>\tspecify merge options between .mli and .ml\n\t\t"^
   options_can_be^
   (string_of_options_list
@@ -202,11 +206,11 @@ let merge_options =
 (** Error and warning messages *)
 
 let warning = "Warning"
-let pwarning s = 
+let pwarning s =
   prerr_endline (warning^": "^s);
   if !Odoc_global.warn_error then incr Odoc_global.errors
 
-let bad_magic_number = 
+let bad_magic_number =
   "Bad magic number for this ocamldoc dump!\n"^
   "This dump was not created by this version of OCamldoc."
 
@@ -346,4 +350,3 @@ let index_of_module_types = index_of^" module types"
 let previous = "Previous"
 let next = "Next"
 let up = "Up"
-

diff --git a/otherlibs/CVS/Entries b/otherlibs/CVS/Entries
new file mode 100644 (file)
index 0000000..1784810
--- /dev/null
+++ b/otherlibs/CVS/Entries
@@ -0,0 +1 @@
+D

diff --git a/otherlibs/CVS/Entries.Log b/otherlibs/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..46a0c26
--- /dev/null
+++ b/otherlibs/CVS/Entries.Log
@@ -0,0 +1,19 @@
+A D/bigarray////
+A D/db////
+A D/dbm////
+A D/dynlink////
+A D/dyntypes////
+A D/graph////
+A D/join////
+A D/labltk////
+A D/macosunix////
+A D/num////
+A D/str////
+A D/systhreads////
+A D/threads////
+A D/unix////
+A D/win32graph////
+A D/win32unix////
+R D/macosunix////
+R D/join////
+R D/dyntypes////

diff --git a/otherlibs/CVS/Repository b/otherlibs/CVS/Repository
new file mode 100644 (file)
index 0000000..a8ac51f
--- /dev/null
+++ b/otherlibs/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs

diff --git a/otherlibs/CVS/Root b/otherlibs/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/CVS/Tag b/otherlibs/CVS/Tag
new file mode 100644 (file)
index 0000000..8b28f3e
--- /dev/null
+++ b/otherlibs/CVS/Tag
@@ -0,0 +1 @@
+Tocaml3083

diff --git a/otherlibs/bigarray/.depend b/otherlibs/bigarray/.depend
index 8ce87779bc6d3c4f1cfe1ab4d5f9e8a05eda5a34..ef5e8b5d4b6fafef82aa99606a60c242afa1ab97 100644 (file)
--- a/otherlibs/bigarray/.depend
+++ b/otherlibs/bigarray/.depend
@@ -1,10 +1,10 @@
 bigarray_stubs.o: bigarray_stubs.c ../../byterun/alloc.h \
   ../../byterun/compatibility.h ../../byterun/misc.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/mlvalues.h bigarray.h ../../byterun/compare.h \
-  ../../byterun/custom.h ../../byterun/fail.h ../../byterun/intext.h \
-  ../../byterun/io.h ../../byterun/fix_code.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/mlvalues.h bigarray.h ../../byterun/custom.h \
+  ../../byterun/fail.h ../../byterun/intext.h ../../byterun/io.h \
+  ../../byterun/fix_code.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
 mmap_unix.o: mmap_unix.c bigarray.h ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \

diff --git a/otherlibs/bigarray/CVS/Entries b/otherlibs/bigarray/CVS/Entries
new file mode 100644 (file)
index 0000000..48975e0
--- /dev/null
+++ b/otherlibs/bigarray/CVS/Entries
@@ -0,0 +1,11 @@
+/.cvsignore/1.2/Thu Oct 11 12:04:37 2001//Tocaml3083
+/.depend/1.16.4.1/Tue Feb 22 14:33:36 2005//Tocaml3083
+/Makefile/1.18/Thu Jun 27 11:36:00 2002//Tocaml3083
+/Makefile.nt/1.10/Tue Jul  8 14:24:07 2003//Tocaml3083
+/bigarray.h/1.7/Tue Jul  8 14:24:07 2003//Tocaml3083
+/bigarray.ml/1.12/Sat May 25 08:34:05 2002//Tocaml3083
+/bigarray.mli/1.21/Sat May 25 08:34:05 2002//Tocaml3083
+/bigarray_stubs.c/1.19.4.1/Tue Feb 22 14:33:36 2005//Tocaml3083
+/mmap_unix.c/1.7/Fri Dec  7 13:39:50 2001//Tocaml3083
+/mmap_win32.c/1.4/Fri Jun  7 09:49:38 2002//Tocaml3083
+D

diff --git a/otherlibs/bigarray/CVS/Repository b/otherlibs/bigarray/CVS/Repository
new file mode 100644 (file)
index 0000000..0566dd1
--- /dev/null
+++ b/otherlibs/bigarray/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/bigarray

diff --git a/otherlibs/bigarray/CVS/Root b/otherlibs/bigarray/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/bigarray/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/bigarray/CVS/Tag b/otherlibs/bigarray/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/bigarray/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/bigarray/bigarray_stubs.c b/otherlibs/bigarray/bigarray_stubs.c
index c2a68f5e0c3ad60bb05602225ddbf5b38f8d27f1..da2a35ad17a2c3fd906d9b1bf26a951cfafbeabe 100644 (file)
--- a/otherlibs/bigarray/bigarray_stubs.c
+++ b/otherlibs/bigarray/bigarray_stubs.c
@@ -11,14 +11,13 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: bigarray_stubs.c,v 1.19 2003/12/15 18:10:50 doligez Exp $ */
+/* $Id: bigarray_stubs.c,v 1.19.4.1 2005/02/22 14:33:36 doligez Exp $ */
 
 #include <stddef.h>
 #include <stdarg.h>
 #include <string.h>
 #include "alloc.h"
 #include "bigarray.h"
-#include "compare.h"
 #include "custom.h"
 #include "fail.h"
 #include "intext.h"

diff --git a/otherlibs/db/CVS/Entries b/otherlibs/db/CVS/Entries
new file mode 100644 (file)
index 0000000..e9ab91b
--- /dev/null
+++ b/otherlibs/db/CVS/Entries
@@ -0,0 +1,2 @@
+/.depend/1.1/Mon Feb 23 12:42:22 1998//Tocaml3083
+D

diff --git a/otherlibs/db/CVS/Repository b/otherlibs/db/CVS/Repository
new file mode 100644 (file)
index 0000000..ba4c757
--- /dev/null
+++ b/otherlibs/db/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/db

diff --git a/otherlibs/db/CVS/Root b/otherlibs/db/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/db/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/db/CVS/Tag b/otherlibs/db/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/db/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/dbm/CVS/Entries b/otherlibs/dbm/CVS/Entries
new file mode 100644 (file)
index 0000000..ebfb47e
--- /dev/null
+++ b/otherlibs/dbm/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.1/Thu Oct 11 12:04:37 2001//Tocaml3083
+/.depend/1.6/Thu Jul  3 14:33:30 1997//Tocaml3083
+/Makefile/1.23/Thu Jun 27 11:36:01 2002//Tocaml3083
+/cldbm.c/1.8/Tue Jul  8 13:50:31 2003//Tocaml3083
+/dbm.ml/1.10/Fri Dec  7 13:39:51 2001//Tocaml3083
+/dbm.mli/1.15/Fri Dec  7 13:39:51 2001//Tocaml3083
+D

diff --git a/otherlibs/dbm/CVS/Repository b/otherlibs/dbm/CVS/Repository
new file mode 100644 (file)
index 0000000..0bc2766
--- /dev/null
+++ b/otherlibs/dbm/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/dbm

diff --git a/otherlibs/dbm/CVS/Root b/otherlibs/dbm/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/dbm/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/dbm/CVS/Tag b/otherlibs/dbm/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/dbm/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/dynlink/.depend b/otherlibs/dynlink/.depend
index 251aef84c375f33b8612f0262f7c61df717d6901..864268dbbd073999990cfef4684598d62d872172 100644 (file)
--- a/otherlibs/dynlink/.depend
+++ b/otherlibs/dynlink/.depend
@@ -1,10 +1,10 @@
-dynlink.cmo: ../../utils/config.cmi ../../utils/consistbl.cmi \
-    ../../bytecomp/dll.cmi ../../bytecomp/emitcode.cmi \
-    ../../bytecomp/meta.cmi ../../utils/misc.cmi ../../bytecomp/opcodes.cmo \
-    ../../bytecomp/symtable.cmi dynlink.cmi 
-dynlink.cmx: ../../utils/config.cmx ../../utils/consistbl.cmx \
-    ../../bytecomp/dll.cmx ../../bytecomp/emitcode.cmx \
-    ../../bytecomp/meta.cmx ../../utils/misc.cmx ../../bytecomp/opcodes.cmx \
-    ../../bytecomp/symtable.cmx dynlink.cmi 
+dynlink.cmo: ../../bytecomp/symtable.cmi ../../bytecomp/opcodes.cmo \
+    ../../utils/misc.cmi ../../bytecomp/meta.cmi ../../bytecomp/emitcode.cmi \
+    ../../bytecomp/dll.cmi ../../utils/consistbl.cmi ../../utils/config.cmi \
+    dynlink.cmi 
+dynlink.cmx: ../../bytecomp/symtable.cmx ../../bytecomp/opcodes.cmx \
+    ../../utils/misc.cmx ../../bytecomp/meta.cmx ../../bytecomp/emitcode.cmx \
+    ../../bytecomp/dll.cmx ../../utils/consistbl.cmx ../../utils/config.cmx \
+    dynlink.cmi 
 extract_crc.cmo: dynlink.cmi 
 extract_crc.cmx: dynlink.cmx 

diff --git a/otherlibs/dynlink/CVS/Entries b/otherlibs/dynlink/CVS/Entries
new file mode 100644 (file)
index 0000000..61563b8
--- /dev/null
+++ b/otherlibs/dynlink/CVS/Entries
@@ -0,0 +1,8 @@
+/.cvsignore/1.1/Sat May  4 14:38:51 1996//Tocaml3083
+/.depend/1.6.4.1/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Makefile/1.27/Sun Feb 22 15:07:51 2004//Tocaml3083
+/Makefile.nt/1.14/Mon Mar 24 15:31:30 2003//Tocaml3083
+/dynlink.ml/1.31/Mon May 26 13:46:36 2003//Tocaml3083
+/dynlink.mli/1.21/Sun Nov 17 16:42:11 2002//Tocaml3083
+/extract_crc.ml/1.10/Fri Apr  9 13:26:41 2004//Tocaml3083
+D

diff --git a/otherlibs/dynlink/CVS/Repository b/otherlibs/dynlink/CVS/Repository
new file mode 100644 (file)
index 0000000..a9a28d4
--- /dev/null
+++ b/otherlibs/dynlink/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/dynlink

diff --git a/otherlibs/dynlink/CVS/Root b/otherlibs/dynlink/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/dynlink/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/dynlink/CVS/Tag b/otherlibs/dynlink/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/dynlink/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/graph/.depend b/otherlibs/graph/.depend
index 9e912d36f3a1348d1c9929c5246714e93f880787..3d8fa25a4452955028bcc9261af972867d608c23 100644 (file)
--- a/otherlibs/graph/.depend
+++ b/otherlibs/graph/.depend
@@ -1,50 +1,85 @@
-color.o: color.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h
-draw.o: draw.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h
-dump_img.o: dump_img.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/alloc.h \
+color.o: color.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h /usr/X11R6/include/X11/Xatom.h
+draw.o: draw.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h
+dump_img.o: dump_img.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h image.h ../../byterun/alloc.h \
   ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
   ../../byterun/freelist.h ../../byterun/minor_gc.h
-events.o: events.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/signals.h
-fill.o: fill.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+events.o: events.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/signals.h
+fill.o: fill.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
-image.o: image.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/alloc.h \
+image.o: image.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h image.h ../../byterun/alloc.h \
   ../../byterun/custom.h
-make_img.o: make_img.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+make_img.o: make_img.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h image.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
-open.o: open.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/callback.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+open.o: open.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/callback.h \
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
-point_col.o: point_col.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h
-sound.o: sound.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h
-subwindow.o: subwindow.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h
-text.o: text.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h
+point_col.o: point_col.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h
+sound.o: sound.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h
+subwindow.o: subwindow.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h
+text.o: text.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h
 graphics.cmo: graphics.cmi 
 graphics.cmx: graphics.cmi 
 graphicsX11.cmo: graphics.cmi graphicsX11.cmi 

diff --git a/otherlibs/graph/CVS/Entries b/otherlibs/graph/CVS/Entries
new file mode 100644 (file)
index 0000000..db8186b
--- /dev/null
+++ b/otherlibs/graph/CVS/Entries
@@ -0,0 +1,22 @@
+/.cvsignore/1.3/Thu Oct 11 12:04:38 2001//Tocaml3083
+/.depend/1.19.4.3/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Makefile/1.35/Tue Aug  5 13:39:33 2003//Tocaml3083
+/color.c/1.18/Mon May 17 17:10:00 2004//Tocaml3083
+/draw.c/1.19/Sun May 30 14:11:41 2004//Tocaml3083
+/dump_img.c/1.11/Wed Mar 24 15:02:04 2004//Tocaml3083
+/events.c/1.17/Sun May 30 10:25:08 2004//Tocaml3083
+/fill.c/1.14/Sun May 30 14:11:41 2004//Tocaml3083
+/graphics.ml/1.25/Wed Mar 24 15:02:06 2004//Tocaml3083
+/graphics.mli/1.36/Wed Mar 24 15:02:06 2004//Tocaml3083
+/graphicsX11.ml/1.3/Wed Mar 24 15:02:06 2004//Tocaml3083
+/graphicsX11.mli/1.4/Fri Dec  7 13:39:54 2001//Tocaml3083
+/image.c/1.13/Wed Mar 24 15:02:05 2004//Tocaml3083
+/image.h/1.8/Wed Mar 24 15:02:06 2004//Tocaml3083
+/libgraph.h/1.23/Sun May 30 10:25:08 2004//Tocaml3083
+/make_img.c/1.13/Wed Mar 24 15:02:05 2004//Tocaml3083
+/open.c/1.32.2.1/Wed Jan 12 15:32:18 2005//Tocaml3083
+/point_col.c/1.8/Wed Mar 24 15:02:05 2004//Tocaml3083
+/sound.c/1.9/Wed Mar 24 15:02:05 2004//Tocaml3083
+/subwindow.c/1.6/Wed Mar 24 15:02:05 2004//Tocaml3083
+/text.c/1.15/Wed Mar 24 15:02:06 2004//Tocaml3083
+D

diff --git a/otherlibs/graph/CVS/Repository b/otherlibs/graph/CVS/Repository
new file mode 100644 (file)
index 0000000..775d1e7
--- /dev/null
+++ b/otherlibs/graph/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/graph

diff --git a/otherlibs/graph/CVS/Root b/otherlibs/graph/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/graph/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/graph/CVS/Tag b/otherlibs/graph/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/graph/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/graph/open.c b/otherlibs/graph/open.c
index d829704f4c43efffd239d36c9343b2135c697d7a..bf7acfc082d0b0da2d5aa52b073c65b7708fa7fa 100644 (file)
--- a/otherlibs/graph/open.c
+++ b/otherlibs/graph/open.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: open.c,v 1.32 2004/05/30 10:25:08 xleroy Exp $ */
+/* $Id: open.c,v 1.32.2.1 2005/01/12 15:32:18 doligez Exp $ */
 
 #include <string.h>
 #include <fcntl.h>
@@ -219,6 +219,8 @@ value caml_gr_close_graph(void)
     XFreeGC(caml_gr_display, caml_gr_bstore.gc);
     XFreePixmap(caml_gr_display, caml_gr_bstore.win);
     XFlush(caml_gr_display);
+    XCloseDisplay (caml_gr_display);
+    caml_gr_display = NULL;
   }
   return Val_unit;
 }

diff --git a/otherlibs/labltk/CVS/Entries b/otherlibs/labltk/CVS/Entries
new file mode 100644 (file)
index 0000000..ca26315
--- /dev/null
+++ b/otherlibs/labltk/CVS/Entries
@@ -0,0 +1,8 @@
+/.cvsignore/1.2/Tue Jul  9 16:23:20 2002//Tocaml3083
+/Changes/1.2/Fri Apr 26 12:15:31 2002//Tocaml3083
+/Makefile/1.9/Fri Aug 29 14:08:20 2003//Tocaml3083
+/Makefile.nt/1.4/Fri Jun  7 09:49:38 2002//Tocaml3083
+/README/1.5/Tue Jul 23 14:11:54 2002//Tocaml3083
+/Widgets.src/1.22.4.1/Wed Feb  2 06:39:39 2005//Tocaml3083
+/labl.gif/1.5/Fri Apr 21 08:33:30 2000/-kb/Tocaml3083
+D

diff --git a/otherlibs/labltk/CVS/Entries.Log b/otherlibs/labltk/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..e0fc5d3
--- /dev/null
+++ b/otherlibs/labltk/CVS/Entries.Log
@@ -0,0 +1,14 @@
+A D/browser////
+A D/builtin////
+A D/camltk////
+A D/compiler////
+A D/example////
+A D/examples_camltk////
+A D/examples_labltk////
+A D/frx////
+A D/jpf////
+A D/labltk////
+A D/lib////
+A D/support////
+A D/tkanim////
+R D/example////

diff --git a/otherlibs/labltk/CVS/Repository b/otherlibs/labltk/CVS/Repository
new file mode 100644 (file)
index 0000000..ac322ba
--- /dev/null
+++ b/otherlibs/labltk/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk

diff --git a/otherlibs/labltk/CVS/Root b/otherlibs/labltk/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/CVS/Tag b/otherlibs/labltk/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/Widgets.src b/otherlibs/labltk/Widgets.src
index 5a34ce8e74928bd473e5498f32290d344926ebfc..e59c4354384f3929e02db4f68c9de7cd9f91bbed 100644 (file)
--- a/otherlibs/labltk/Widgets.src
+++ b/otherlibs/labltk/Widgets.src
@@ -60,6 +60,7 @@ type Relief {
    Sunken ["sunken"]
    Flat   ["flat"]
    Ridge  ["ridge"]
+   Solid  ["solid"]
    Groove ["groove"]
 }
 

diff --git a/otherlibs/labltk/browser/CVS/Entries b/otherlibs/labltk/browser/CVS/Entries
new file mode 100644 (file)
index 0000000..650a45e
--- /dev/null
+++ b/otherlibs/labltk/browser/CVS/Entries
@@ -0,0 +1,54 @@
+/.cvsignore/1.3/Tue Feb  1 05:43:24 2000//Tocaml3083
+/.depend/1.3/Thu Nov 22 07:36:15 2001//Tocaml3083
+/Makefile/1.21/Mon Aug 12 05:31:21 2002//Tocaml3083
+/Makefile.nt/1.12/Thu Jul  4 10:23:16 2002//Tocaml3083
+/README/1.7/Thu Sep 27 08:24:50 2001//Tocaml3083
+/dummyUnix.mli/1.4/Mon Dec 29 22:15:01 2003//Tocaml3083
+/dummyWin.mli/1.2/Fri Dec  7 13:39:55 2001//Tocaml3083
+/editor.ml/1.40/Wed Apr  2 06:56:05 2003//Tocaml3083
+/editor.mli/1.5/Fri Dec  7 13:39:57 2001//Tocaml3083
+/fileselect.ml/1.20/Fri Aug  9 10:34:44 2002//Tocaml3083
+/fileselect.mli/1.7/Fri Apr 26 12:15:33 2002//Tocaml3083
+/help.ml/1.3/Thu Jul  4 10:25:29 2002//Tocaml3083
+/help.txt/1.2/Thu Jul  4 10:25:29 2002//Tocaml3083
+/jg_bind.ml/1.7/Fri Dec  7 13:39:57 2001//Tocaml3083
+/jg_bind.mli/1.5/Fri Dec  7 13:39:57 2001//Tocaml3083
+/jg_box.ml/1.8/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_button.ml/1.8/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_completion.ml/1.10/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_completion.mli/1.6/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_config.ml/1.10/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_config.mli/1.5/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_entry.ml/1.7/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_memo.ml/1.8/Fri Dec  7 13:39:58 2001//Tocaml3083
+/jg_memo.mli/1.7/Fri Dec  7 13:39:59 2001//Tocaml3083
+/jg_menu.ml/1.8/Fri Dec  7 13:39:59 2001//Tocaml3083
+/jg_message.ml/1.18/Fri Jul 26 00:04:05 2002//Tocaml3083
+/jg_message.mli/1.10/Fri Jul 26 00:04:05 2002//Tocaml3083
+/jg_multibox.ml/1.11/Fri Dec  7 13:39:59 2001//Tocaml3083
+/jg_multibox.mli/1.6/Fri Dec  7 13:39:59 2001//Tocaml3083
+/jg_text.ml/1.11/Fri Aug  9 10:34:44 2002//Tocaml3083
+/jg_text.mli/1.7/Fri Dec  7 13:40:00 2001//Tocaml3083
+/jg_tk.ml/1.7/Fri Dec  7 13:40:00 2001//Tocaml3083
+/jg_toplevel.ml/1.8/Fri Dec  7 13:40:00 2001//Tocaml3083
+/lexical.ml/1.15/Fri Nov  1 17:06:45 2002//Tocaml3083
+/lexical.mli/1.6/Fri Dec  7 13:40:00 2001//Tocaml3083
+/list2.ml/1.9/Fri Dec  7 13:40:00 2001//Tocaml3083
+/main.ml/1.30/Fri May  2 13:20:58 2003//Tocaml3083
+/mytypes.mli/1.6/Wed Apr  2 06:56:05 2003//Tocaml3083
+/searchid.ml/1.22/Sat Jun 12 08:55:46 2004//Tocaml3083
+/searchid.mli/1.6/Thu Jul 25 22:51:47 2002//Tocaml3083
+/searchpos.ml/1.44.2.1/Tue Jun 29 01:50:19 2004//Tocaml3083
+/searchpos.mli/1.12/Wed Apr  2 06:56:05 2003//Tocaml3083
+/setpath.ml/1.16/Fri Apr 26 12:15:34 2002//Tocaml3083
+/setpath.mli/1.6/Fri Dec  7 13:40:02 2001//Tocaml3083
+/shell.ml/1.39/Tue Aug  6 03:03:09 2002//Tocaml3083
+/shell.mli/1.8/Thu Jul 25 22:51:47 2002//Tocaml3083
+/typecheck.ml/1.15/Wed Apr  2 06:56:06 2003//Tocaml3083
+/typecheck.mli/1.5/Fri Dec  7 13:40:02 2001//Tocaml3083
+/useunix.ml/1.13/Fri Aug  9 10:34:44 2002//Tocaml3083
+/useunix.mli/1.6/Fri Aug  9 10:34:44 2002//Tocaml3083
+/viewer.ml/1.31/Sat Jun 12 08:55:47 2004//Tocaml3083
+/viewer.mli/1.7/Thu Jul 11 13:49:51 2002//Tocaml3083
+/winmain.c/1.4/Thu Apr  1 13:09:21 2004//Tocaml3083
+D

diff --git a/otherlibs/labltk/browser/CVS/Repository b/otherlibs/labltk/browser/CVS/Repository
new file mode 100644 (file)
index 0000000..278e169
--- /dev/null
+++ b/otherlibs/labltk/browser/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/browser

diff --git a/otherlibs/labltk/browser/CVS/Root b/otherlibs/labltk/browser/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/browser/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/browser/CVS/Tag b/otherlibs/labltk/browser/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/browser/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/builtin/CVS/Entries b/otherlibs/labltk/builtin/CVS/Entries
new file mode 100644 (file)
index 0000000..1ef8ba3
--- /dev/null
+++ b/otherlibs/labltk/builtin/CVS/Entries
@@ -0,0 +1,47 @@
+/LICENSE/1.2/Fri Dec  7 13:40:03 2001//Tocaml3083
+/builtin_FilePattern.ml/1.2/Fri Apr 26 12:15:35 2002//Tocaml3083
+/builtin_GetBitmap.ml/1.6/Fri Apr 26 12:15:35 2002//Tocaml3083
+/builtin_GetCursor.ml/1.7/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtin_GetPixel.ml/1.6/Fri Apr 26 12:15:35 2002//Tocaml3083
+/builtin_ScrollValue.ml/1.7/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtin_bind.ml/1.12/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtin_bindtags.ml/1.7/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtin_font.ml/1.3/Tue Jul  8 08:51:13 2003//Tocaml3083
+/builtin_grab.ml/1.3/Tue Jul  8 08:51:13 2003//Tocaml3083
+/builtin_index.ml/1.7/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtin_palette.ml/1.6/Fri Apr 26 12:15:36 2002//Tocaml3083
+/builtin_text.ml/1.7/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtina_empty.ml/1.3/Tue Nov 30 14:59:26 1999//Tocaml3083
+/builtinf_GetPixel.ml/1.3/Fri Apr 26 12:15:37 2002//Tocaml3083
+/builtinf_bind.ml/1.8/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtini_GetBitmap.ml/1.6/Fri Apr 26 12:15:38 2002//Tocaml3083
+/builtini_GetCursor.ml/1.6/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtini_GetPixel.ml/1.8/Fri Oct 11 18:56:18 2002//Tocaml3083
+/builtini_ScrollValue.ml/1.6/Fri Oct 11 18:56:18 2002//Tocaml3083
+/builtini_bind.ml/1.13/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtini_bindtags.ml/1.5/Fri Apr 26 12:15:39 2002//Tocaml3083
+/builtini_font.ml/1.2/Fri Apr 26 12:15:39 2002//Tocaml3083
+/builtini_grab.ml/1.2/Tue Nov 30 14:59:27 1999//Tocaml3083
+/builtini_index.ml/1.12/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtini_palette.ml/1.6/Tue Jul 23 14:11:54 2002//Tocaml3083
+/builtini_text.ml/1.11/Fri Apr 26 12:15:40 2002//Tocaml3083
+/canvas_bind.ml/1.10/Tue Jul 23 14:11:54 2002//Tocaml3083
+/canvas_bind.mli/1.7/Fri Apr 26 12:15:40 2002//Tocaml3083
+/dialog.ml/1.11/Tue Jul 23 14:11:54 2002//Tocaml3083
+/dialog.mli/1.4/Fri Apr 26 12:15:40 2002//Tocaml3083
+/image.ml/1.2/Fri Apr 26 12:15:41 2002//Tocaml3083
+/image.mli/1.2/Fri Apr 26 12:15:41 2002//Tocaml3083
+/optionmenu.ml/1.10/Tue Jul 23 14:11:54 2002//Tocaml3083
+/optionmenu.mli/1.4/Fri Apr 26 12:15:41 2002//Tocaml3083
+/rawimg.ml/1.2/Fri Apr 26 12:15:41 2002//Tocaml3083
+/rawimg.mli/1.2/Fri Apr 26 12:15:41 2002//Tocaml3083
+/report.ml/1.2/Fri Apr 26 12:15:42 2002//Tocaml3083
+/selection_handle_set.ml/1.12/Tue Jul 23 14:11:55 2002//Tocaml3083
+/selection_handle_set.mli/1.5/Fri Apr 26 12:15:42 2002//Tocaml3083
+/selection_own_set.ml/1.8/Tue Jul 23 14:11:55 2002//Tocaml3083
+/selection_own_set.mli/1.4/Fri Apr 26 12:15:42 2002//Tocaml3083
+/text_tag_bind.ml/1.8/Tue Jul 23 14:11:55 2002//Tocaml3083
+/text_tag_bind.mli/1.5/Fri Apr 26 12:15:42 2002//Tocaml3083
+/winfo_contained.ml/1.5/Fri Apr 26 12:15:42 2002//Tocaml3083
+/winfo_contained.mli/1.4/Fri Apr 26 12:15:43 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/builtin/CVS/Repository b/otherlibs/labltk/builtin/CVS/Repository
new file mode 100644 (file)
index 0000000..2f5f1a2
--- /dev/null
+++ b/otherlibs/labltk/builtin/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/builtin

diff --git a/otherlibs/labltk/builtin/CVS/Root b/otherlibs/labltk/builtin/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/builtin/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/builtin/CVS/Tag b/otherlibs/labltk/builtin/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/builtin/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/camltk/CVS/Entries b/otherlibs/labltk/camltk/CVS/Entries
new file mode 100644 (file)
index 0000000..ef04a09
--- /dev/null
+++ b/otherlibs/labltk/camltk/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.2/Fri Apr 26 12:15:43 2002//Tocaml3083
+/Makefile/1.5/Fri Aug 29 14:08:21 2003//Tocaml3083
+/Makefile.gen/1.4.6.1/Mon Jul 12 09:38:05 2004//Tocaml3083
+/Makefile.gen.nt/1.4/Fri Jun  7 13:31:21 2002//Tocaml3083
+/Makefile.nt/1.3/Fri Jun  7 09:49:39 2002//Tocaml3083
+/modules/1.1/Fri Apr 26 13:58:15 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/camltk/CVS/Repository b/otherlibs/labltk/camltk/CVS/Repository
new file mode 100644 (file)
index 0000000..6ce4361
--- /dev/null
+++ b/otherlibs/labltk/camltk/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/camltk

diff --git a/otherlibs/labltk/camltk/CVS/Root b/otherlibs/labltk/camltk/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/camltk/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/camltk/CVS/Tag b/otherlibs/labltk/camltk/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/camltk/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/compiler/CVS/Entries b/otherlibs/labltk/compiler/CVS/Entries
new file mode 100644 (file)
index 0000000..ce3ef33
--- /dev/null
+++ b/otherlibs/labltk/compiler/CVS/Entries
@@ -0,0 +1,22 @@
+/.cvsignore/1.2/Fri Apr 26 12:15:45 2002//Tocaml3083
+/.depend/1.3/Fri Apr 26 12:15:45 2002//Tocaml3083
+/Makefile/1.7/Fri Apr 26 12:15:45 2002//Tocaml3083
+/Makefile.nt/1.5/Fri Jun  7 09:49:39 2002//Tocaml3083
+/code.mli/1.2/Fri Apr 26 12:15:45 2002//Tocaml3083
+/compile.ml/1.31/Tue Jul  8 08:50:24 2003//Tocaml3083
+/copyright/1.2/Fri Apr 26 12:15:46 2002//Tocaml3083
+/flags.ml/1.2/Fri Apr 26 12:15:46 2002//Tocaml3083
+/intf.ml/1.20/Tue Jul 23 14:11:55 2002//Tocaml3083
+/lexer.mll/1.14/Tue Jul 23 14:11:55 2002//Tocaml3083
+/maincompile.ml/1.19/Wed Oct 30 23:31:26 2002//Tocaml3083
+/parser.mly/1.9/Thu Mar 27 15:04:44 2003//Tocaml3083
+/pp.ml/1.2/Fri Apr 26 12:15:47 2002//Tocaml3083
+/ppexec.ml/1.3/Tue Jul 23 14:11:55 2002//Tocaml3083
+/pplex.mli/1.2/Fri Apr 26 12:15:47 2002//Tocaml3083
+/pplex.mll/1.3/Tue Jul 23 14:11:55 2002//Tocaml3083
+/ppparse.ml/1.3/Tue Jul 23 14:11:55 2002//Tocaml3083
+/ppyac.mly/1.2/Fri Apr 26 12:15:48 2002//Tocaml3083
+/printer.ml/1.6/Fri Apr 26 12:15:48 2002//Tocaml3083
+/tables.ml/1.20/Fri Apr 26 12:15:48 2002//Tocaml3083
+/tsort.ml/1.12/Fri Apr 26 12:15:48 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/compiler/CVS/Repository b/otherlibs/labltk/compiler/CVS/Repository
new file mode 100644 (file)
index 0000000..6a96048
--- /dev/null
+++ b/otherlibs/labltk/compiler/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/compiler

diff --git a/otherlibs/labltk/compiler/CVS/Root b/otherlibs/labltk/compiler/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/compiler/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/compiler/CVS/Tag b/otherlibs/labltk/compiler/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/compiler/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/examples_camltk/CVS/Entries b/otherlibs/labltk/examples_camltk/CVS/Entries
new file mode 100644 (file)
index 0000000..9381183
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/CVS/Entries
@@ -0,0 +1,16 @@
+/.cvsignore/1.2/Fri Apr 26 12:15:49 2002//Tocaml3083
+/Makefile/1.2/Fri Apr 26 12:15:49 2002//Tocaml3083
+/Makefile.nt/1.3/Tue Jun 11 08:30:19 2002//Tocaml3083
+/addition.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/eyes.ml/1.2/Fri Apr 26 12:15:51 2002//Tocaml3083
+/fileinput.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/fileopen.ml/1.2/Fri Apr 26 12:15:51 2002//Tocaml3083
+/helloworld.ml/1.2/Fri Apr 26 12:15:51 2002//Tocaml3083
+/jptest.ml/1.2/Fri Apr 26 12:15:51 2002//Tocaml3083
+/mytext.ml/1.2/Fri Apr 26 12:15:52 2002//Tocaml3083
+/socketinput.ml/1.2/Fri Apr 26 12:15:52 2002//Tocaml3083
+/taddition.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/tetris.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/text.ml/1.2/Fri Apr 26 12:15:53 2002//Tocaml3083
+/winskel.ml/1.2/Fri Apr 26 12:15:53 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/examples_camltk/CVS/Entries.Log b/otherlibs/labltk/examples_camltk/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..375967b
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/CVS/Entries.Log
@@ -0,0 +1 @@
+A D/images////

diff --git a/otherlibs/labltk/examples_camltk/CVS/Repository b/otherlibs/labltk/examples_camltk/CVS/Repository
new file mode 100644 (file)
index 0000000..88a5619
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/examples_camltk

diff --git a/otherlibs/labltk/examples_camltk/CVS/Root b/otherlibs/labltk/examples_camltk/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/examples_camltk/CVS/Tag b/otherlibs/labltk/examples_camltk/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/examples_camltk/images/CVS/Entries b/otherlibs/labltk/examples_camltk/images/CVS/Entries
new file mode 100644 (file)
index 0000000..81cf181
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/images/CVS/Entries
@@ -0,0 +1,4 @@
+/CamlBook.gif/1.2/Fri Apr 26 12:15:54 2002//Tocaml3083
+/Lambda2.back.gif/1.2/Fri Apr 26 12:15:54 2002//Tocaml3083
+/dojoji.back.gif/1.2/Fri Apr 26 12:15:55 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/examples_camltk/images/CVS/Repository b/otherlibs/labltk/examples_camltk/images/CVS/Repository
new file mode 100644 (file)
index 0000000..201ff9d
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/images/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/examples_camltk/images

diff --git a/otherlibs/labltk/examples_camltk/images/CVS/Root b/otherlibs/labltk/examples_camltk/images/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/images/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/examples_camltk/images/CVS/Tag b/otherlibs/labltk/examples_camltk/images/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/examples_camltk/images/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/examples_labltk/CVS/Entries b/otherlibs/labltk/examples_labltk/CVS/Entries
new file mode 100644 (file)
index 0000000..33eacb9
--- /dev/null
+++ b/otherlibs/labltk/examples_labltk/CVS/Entries
@@ -0,0 +1,15 @@
+/.cvsignore/1.3/Thu Dec 19 13:38:26 2002//Tocaml3083
+/Lambda2.back.gif/1.2/Fri Apr 26 12:15:56 2002//Tocaml3083
+/Makefile/1.3/Thu Dec 19 13:38:29 2002//Tocaml3083
+/Makefile.nt/1.3/Tue Jun 11 08:30:19 2002//Tocaml3083
+/README/1.2/Fri Apr 26 12:15:57 2002//Tocaml3083
+/calc.ml/1.3/Fri Oct 11 18:56:18 2002//Tocaml3083
+/clock.ml/1.2/Fri Apr 26 12:15:58 2002//Tocaml3083
+/demo.ml/1.2/Fri Apr 26 12:15:58 2002//Tocaml3083
+/eyes.ml/1.2/Fri Apr 26 12:15:58 2002//Tocaml3083
+/hello.ml/1.2/Fri Apr 26 12:15:58 2002//Tocaml3083
+/hello.tcl/1.3/Thu Aug 21 13:51:29 2003//Tocaml3083
+/lang.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/taquin.ml/1.2/Fri Apr 26 12:15:59 2002//Tocaml3083
+/tetris.ml/1.4/Sat Jun 12 03:20:00 2004//Tocaml3083
+D

diff --git a/otherlibs/labltk/examples_labltk/CVS/Repository b/otherlibs/labltk/examples_labltk/CVS/Repository
new file mode 100644 (file)
index 0000000..a6c392b
--- /dev/null
+++ b/otherlibs/labltk/examples_labltk/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/examples_labltk

diff --git a/otherlibs/labltk/examples_labltk/CVS/Root b/otherlibs/labltk/examples_labltk/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/examples_labltk/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/examples_labltk/CVS/Tag b/otherlibs/labltk/examples_labltk/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/examples_labltk/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/frx/CVS/Entries b/otherlibs/labltk/frx/CVS/Entries
new file mode 100644 (file)
index 0000000..2ad1fcb
--- /dev/null
+++ b/otherlibs/labltk/frx/CVS/Entries
@@ -0,0 +1,46 @@
+/.depend/1.2/Fri Apr 26 12:16:00 2002//Tocaml3083
+/Makefile/1.2/Fri Apr 26 12:16:00 2002//Tocaml3083
+/Makefile.nt/1.3/Fri Jun  7 09:49:39 2002//Tocaml3083
+/README/1.2/Fri Apr 26 12:16:01 2002//Tocaml3083
+/frx_after.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_after.mli/1.2/Fri Apr 26 12:16:01 2002//Tocaml3083
+/frx_color.ml/1.2/Fri Apr 26 12:16:01 2002//Tocaml3083
+/frx_color.mli/1.2/Fri Apr 26 12:16:01 2002//Tocaml3083
+/frx_ctext.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_ctext.mli/1.2/Fri Apr 26 12:16:02 2002//Tocaml3083
+/frx_dialog.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_dialog.mli/1.2/Fri Apr 26 12:16:02 2002//Tocaml3083
+/frx_entry.ml/1.2/Fri Apr 26 12:16:02 2002//Tocaml3083
+/frx_entry.mli/1.2/Fri Apr 26 12:16:02 2002//Tocaml3083
+/frx_fileinput.ml/1.2/Fri Apr 26 12:16:03 2002//Tocaml3083
+/frx_fillbox.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_fillbox.mli/1.2/Fri Apr 26 12:16:03 2002//Tocaml3083
+/frx_fit.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_fit.mli/1.2/Fri Apr 26 12:16:03 2002//Tocaml3083
+/frx_focus.ml/1.2/Fri Apr 26 12:16:04 2002//Tocaml3083
+/frx_focus.mli/1.2/Fri Apr 26 12:16:04 2002//Tocaml3083
+/frx_font.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_font.mli/1.2/Fri Apr 26 12:16:04 2002//Tocaml3083
+/frx_group.ml/1.2/Fri Apr 26 12:16:04 2002//Tocaml3083
+/frx_lbutton.ml/1.2/Fri Apr 26 12:16:05 2002//Tocaml3083
+/frx_lbutton.mli/1.2/Fri Apr 26 12:16:05 2002//Tocaml3083
+/frx_listbox.ml/1.3/Tue Jul 23 14:11:56 2002//Tocaml3083
+/frx_listbox.mli/1.2/Fri Apr 26 12:16:05 2002//Tocaml3083
+/frx_mem.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_mem.mli/1.2/Fri Apr 26 12:16:06 2002//Tocaml3083
+/frx_misc.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_misc.mli/1.2/Fri Apr 26 12:16:06 2002//Tocaml3083
+/frx_req.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_req.mli/1.2/Fri Apr 26 12:16:07 2002//Tocaml3083
+/frx_rpc.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_rpc.mli/1.2/Fri Apr 26 12:16:08 2002//Tocaml3083
+/frx_selection.ml/1.2/Fri Apr 26 12:16:09 2002//Tocaml3083
+/frx_selection.mli/1.2/Fri Apr 26 12:16:09 2002//Tocaml3083
+/frx_synth.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_synth.mli/1.2/Fri Apr 26 12:16:09 2002//Tocaml3083
+/frx_text.ml/1.3/Tue Jul 23 14:11:58 2002//Tocaml3083
+/frx_text.mli/1.2/Fri Apr 26 12:16:10 2002//Tocaml3083
+/frx_toplevel.mli/1.2/Fri Apr 26 12:16:10 2002//Tocaml3083
+/frx_widget.ml/1.2/Fri Apr 26 12:16:10 2002//Tocaml3083
+/frx_widget.mli/1.2/Fri Apr 26 12:16:10 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/frx/CVS/Repository b/otherlibs/labltk/frx/CVS/Repository
new file mode 100644 (file)
index 0000000..5e895af
--- /dev/null
+++ b/otherlibs/labltk/frx/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/frx

diff --git a/otherlibs/labltk/frx/CVS/Root b/otherlibs/labltk/frx/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/frx/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/frx/CVS/Tag b/otherlibs/labltk/frx/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/frx/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/jpf/CVS/Entries b/otherlibs/labltk/jpf/CVS/Entries
new file mode 100644 (file)
index 0000000..8a271e5
--- /dev/null
+++ b/otherlibs/labltk/jpf/CVS/Entries
@@ -0,0 +1,13 @@
+/Makefile/1.10/Fri Apr 26 12:16:11 2002//Tocaml3083
+/Makefile.nt/1.6/Fri Jun  7 09:49:39 2002//Tocaml3083
+/README/1.2/Fri Apr 26 12:16:11 2002//Tocaml3083
+/balloon.ml/1.15/Fri Apr 26 12:16:12 2002//Tocaml3083
+/balloon.mli/1.7/Fri Apr 26 12:16:12 2002//Tocaml3083
+/balloontest.ml/1.8/Fri Apr 26 12:16:12 2002//Tocaml3083
+/fileselect.ml/1.19/Fri Apr 26 12:16:12 2002//Tocaml3083
+/fileselect.mli/1.7/Fri Apr 26 12:16:12 2002//Tocaml3083
+/jpf_font.ml/1.3/Tue Jul 23 14:11:59 2002//Tocaml3083
+/jpf_font.mli/1.2/Fri Apr 26 12:16:13 2002//Tocaml3083
+/shell.ml/1.3/Tue Jul 23 14:11:59 2002//Tocaml3083
+/shell.mli/1.2/Fri Apr 26 12:16:13 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/jpf/CVS/Repository b/otherlibs/labltk/jpf/CVS/Repository
new file mode 100644 (file)
index 0000000..0632985
--- /dev/null
+++ b/otherlibs/labltk/jpf/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/jpf

diff --git a/otherlibs/labltk/jpf/CVS/Root b/otherlibs/labltk/jpf/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/jpf/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/jpf/CVS/Tag b/otherlibs/labltk/jpf/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/jpf/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/labltk/CVS/Entries b/otherlibs/labltk/labltk/CVS/Entries
new file mode 100644 (file)
index 0000000..2bb165c
--- /dev/null
+++ b/otherlibs/labltk/labltk/CVS/Entries
@@ -0,0 +1,7 @@
+/.cvsignore/1.2/Fri Apr 26 12:16:13 2002//Tocaml3083
+/Makefile/1.5/Fri Aug 29 14:08:21 2003//Tocaml3083
+/Makefile.gen/1.4.6.1/Mon Jul 12 09:38:05 2004//Tocaml3083
+/Makefile.gen.nt/1.4/Fri Jun  7 13:31:21 2002//Tocaml3083
+/Makefile.nt/1.3/Fri Jun  7 09:49:39 2002//Tocaml3083
+/modules/1.1/Fri Apr 26 13:58:17 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/labltk/CVS/Repository b/otherlibs/labltk/labltk/CVS/Repository
new file mode 100644 (file)
index 0000000..1ac0884
--- /dev/null
+++ b/otherlibs/labltk/labltk/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/labltk

diff --git a/otherlibs/labltk/labltk/CVS/Root b/otherlibs/labltk/labltk/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/labltk/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/labltk/CVS/Tag b/otherlibs/labltk/labltk/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/labltk/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/lib/CVS/Entries b/otherlibs/labltk/lib/CVS/Entries
new file mode 100644 (file)
index 0000000..5ab3c1d
--- /dev/null
+++ b/otherlibs/labltk/lib/CVS/Entries
@@ -0,0 +1,4 @@
+/.cvsignore/1.8/Wed Jul 10 12:57:50 2002//Tocaml3083
+/Makefile/1.32/Wed Apr  2 02:35:19 2003//Tocaml3083
+/Makefile.nt/1.11/Fri Jul 12 15:31:40 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/lib/CVS/Repository b/otherlibs/labltk/lib/CVS/Repository
new file mode 100644 (file)
index 0000000..7e68a09
--- /dev/null
+++ b/otherlibs/labltk/lib/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/lib

diff --git a/otherlibs/labltk/lib/CVS/Root b/otherlibs/labltk/lib/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/lib/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/lib/CVS/Tag b/otherlibs/labltk/lib/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/lib/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/support/CVS/Entries b/otherlibs/labltk/support/CVS/Entries
new file mode 100644 (file)
index 0000000..a4d55e4
--- /dev/null
+++ b/otherlibs/labltk/support/CVS/Entries
@@ -0,0 +1,37 @@
+/.depend/1.4/Fri Apr 26 12:16:15 2002//Tocaml3083
+/Makefile/1.15/Thu Jun 27 11:36:01 2002//Tocaml3083
+/Makefile.common/1.21.6.1/Mon Jul 12 09:38:05 2004//Tocaml3083
+/Makefile.common.nt/1.9/Wed Jul  3 09:45:44 2002//Tocaml3083
+/Makefile.nt/1.10/Thu Jul 10 09:18:02 2003//Tocaml3083
+/camltk.h/1.11/Thu Jul 10 09:18:02 2003//Tocaml3083
+/camltkwrap.ml/1.2/Fri Apr 26 12:16:16 2002//Tocaml3083
+/camltkwrap.mli/1.3/Tue Jul 23 14:11:59 2002//Tocaml3083
+/cltkCaml.c/1.8/Fri Apr 26 12:16:17 2002//Tocaml3083
+/cltkDMain.c/1.6/Fri Dec  7 13:40:08 2001//Tocaml3083
+/cltkEval.c/1.14/Mon May 17 17:10:00 2004//Tocaml3083
+/cltkEvent.c/1.8/Fri Apr 26 12:16:17 2002//Tocaml3083
+/cltkFile.c/1.12/Fri Apr 26 12:16:17 2002//Tocaml3083
+/cltkImg.c/1.5/Mon May 17 17:10:00 2004//Tocaml3083
+/cltkMain.c/1.13/Tue Jul 23 14:11:59 2002//Tocaml3083
+/cltkMisc.c/1.10/Tue Jul 23 14:11:59 2002//Tocaml3083
+/cltkTimer.c/1.9/Fri Apr 26 12:16:19 2002//Tocaml3083
+/cltkUtf.c/1.2/Fri Apr 26 12:16:19 2002//Tocaml3083
+/cltkVar.c/1.9/Tue Jul 23 14:11:59 2002//Tocaml3083
+/cltkWait.c/1.9/Tue Jul 23 14:11:59 2002//Tocaml3083
+/fileevent.ml/1.12/Fri Apr 26 12:16:19 2002//Tocaml3083
+/fileevent.mli/1.7/Fri Apr 26 12:16:20 2002//Tocaml3083
+/protocol.ml/1.20/Tue Jul 23 14:11:59 2002//Tocaml3083
+/protocol.mli/1.11/Fri May  3 12:56:59 2002//Tocaml3083
+/rawwidget.ml/1.3/Tue Jul 23 14:11:59 2002//Tocaml3083
+/rawwidget.mli/1.2/Fri Apr 26 12:16:20 2002//Tocaml3083
+/slave.ml/1.5/Fri Apr 26 12:16:21 2002//Tocaml3083
+/support.ml/1.9/Fri Apr 26 12:16:21 2002//Tocaml3083
+/support.mli/1.8/Fri Apr 26 12:16:21 2002//Tocaml3083
+/textvariable.ml/1.16/Tue Jul 23 14:11:59 2002//Tocaml3083
+/textvariable.mli/1.10/Fri Apr 26 12:16:21 2002//Tocaml3083
+/timer.ml/1.10/Thu Sep 12 10:12:26 2002//Tocaml3083
+/timer.mli/1.8/Fri Apr 26 12:16:21 2002//Tocaml3083
+/tkwait.ml/1.7/Fri Apr 26 12:16:21 2002//Tocaml3083
+/widget.ml/1.16/Fri Apr 26 12:16:22 2002//Tocaml3083
+/widget.mli/1.7/Fri Apr 26 12:16:22 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/support/CVS/Repository b/otherlibs/labltk/support/CVS/Repository
new file mode 100644 (file)
index 0000000..da7a9d4
--- /dev/null
+++ b/otherlibs/labltk/support/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/support

diff --git a/otherlibs/labltk/support/CVS/Root b/otherlibs/labltk/support/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/support/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/support/CVS/Tag b/otherlibs/labltk/support/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/support/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/labltk/tkanim/CVS/Entries b/otherlibs/labltk/tkanim/CVS/Entries
new file mode 100644 (file)
index 0000000..08e9a08
--- /dev/null
+++ b/otherlibs/labltk/tkanim/CVS/Entries
@@ -0,0 +1,13 @@
+/.cvsignore/1.1/Mon Apr 28 08:10:52 2003//Tocaml3083
+/.depend/1.2/Fri Apr 26 12:16:22 2002//Tocaml3083
+/Makefile/1.8/Sat May  8 16:04:39 2004//Tocaml3083
+/Makefile.nt/1.4/Thu Jun 27 11:36:01 2002//Tocaml3083
+/README/1.2/Fri Apr 26 12:16:23 2002//Tocaml3083
+/cltkaniminit.c/1.5/Thu Jul 10 09:18:02 2003//Tocaml3083
+/gifanimtest.ml/1.3/Tue Jul 23 14:12:00 2002//Tocaml3083
+/mmm.anim.gif/1.2/Fri Apr 26 12:16:24 2002//Tocaml3083
+/tkAnimGIF.c/1.6/Mon May 17 17:10:00 2004//Tocaml3083
+/tkAppInit.c/1.3/Tue Jul 23 14:12:00 2002//Tocaml3083
+/tkanim.ml/1.2/Fri Apr 26 12:16:25 2002//Tocaml3083
+/tkanim.mli/1.3/Tue Jul 23 14:12:00 2002//Tocaml3083
+D

diff --git a/otherlibs/labltk/tkanim/CVS/Repository b/otherlibs/labltk/tkanim/CVS/Repository
new file mode 100644 (file)
index 0000000..63216be
--- /dev/null
+++ b/otherlibs/labltk/tkanim/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/labltk/tkanim

diff --git a/otherlibs/labltk/tkanim/CVS/Root b/otherlibs/labltk/tkanim/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/labltk/tkanim/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/labltk/tkanim/CVS/Tag b/otherlibs/labltk/tkanim/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/labltk/tkanim/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/num/.depend b/otherlibs/num/.depend
index 406a6bf589bdea01e051c60ff7f3bff5975dee1d..7aedc605f0346c99822f5a325fb943338ec882e3 100644 (file)
--- a/otherlibs/num/.depend
+++ b/otherlibs/num/.depend
@@ -1,4 +1,5 @@
-bng.o: bng.c bng.h bng_ppc.c bng_digit.c
+bng.o: bng.c bng.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/compatibility.h bng_ppc.c bng_digit.c
 bng_alpha.o: bng_alpha.c
 bng_amd64.o: bng_amd64.c
 bng_digit.o: bng_digit.c
@@ -14,23 +15,23 @@ nat_stubs.o: nat_stubs.c ../../byterun/alloc.h \
   ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
   ../../byterun/freelist.h ../../byterun/minor_gc.h bng.h nat.h
 big_int.cmi: nat.cmi 
-num.cmi: big_int.cmi nat.cmi ratio.cmi 
-ratio.cmi: big_int.cmi nat.cmi 
+num.cmi: ratio.cmi nat.cmi big_int.cmi 
+ratio.cmi: nat.cmi big_int.cmi 
 arith_flags.cmo: arith_flags.cmi 
 arith_flags.cmx: arith_flags.cmi 
 arith_status.cmo: arith_flags.cmi arith_status.cmi 
 arith_status.cmx: arith_flags.cmx arith_status.cmi 
-big_int.cmo: int_misc.cmi nat.cmi big_int.cmi 
-big_int.cmx: int_misc.cmx nat.cmx big_int.cmi 
+big_int.cmo: nat.cmi int_misc.cmi big_int.cmi 
+big_int.cmx: nat.cmx int_misc.cmx big_int.cmi 
 int_misc.cmo: int_misc.cmi 
 int_misc.cmx: int_misc.cmi 
 nat.cmo: int_misc.cmi nat.cmi 
 nat.cmx: int_misc.cmx nat.cmi 
-num.cmo: arith_flags.cmi big_int.cmi int_misc.cmi nat.cmi ratio.cmi num.cmi 
-num.cmx: arith_flags.cmx big_int.cmx int_misc.cmx nat.cmx ratio.cmx num.cmi 
-ratio.cmo: arith_flags.cmi big_int.cmi int_misc.cmi nat.cmi string_misc.cmi \
+num.cmo: ratio.cmi nat.cmi int_misc.cmi big_int.cmi arith_flags.cmi num.cmi 
+num.cmx: ratio.cmx nat.cmx int_misc.cmx big_int.cmx arith_flags.cmx num.cmi 
+ratio.cmo: string_misc.cmi nat.cmi int_misc.cmi big_int.cmi arith_flags.cmi \
     ratio.cmi 
-ratio.cmx: arith_flags.cmx big_int.cmx int_misc.cmx nat.cmx string_misc.cmx \
+ratio.cmx: string_misc.cmx nat.cmx int_misc.cmx big_int.cmx arith_flags.cmx \
     ratio.cmi 
 string_misc.cmo: string_misc.cmi 
 string_misc.cmx: string_misc.cmi 

diff --git a/otherlibs/num/CVS/Entries b/otherlibs/num/CVS/Entries
new file mode 100644 (file)
index 0000000..890ec10
--- /dev/null
+++ b/otherlibs/num/CVS/Entries
@@ -0,0 +1,34 @@
+/.cvsignore/1.5/Thu Oct 11 12:04:38 2001//Tocaml3083
+/.depend/1.13.4.1/Tue Feb 22 14:33:37 2005//Tocaml3083
+/.depend.nt/1.3/Tue Aug 28 14:47:24 2001//Tocaml3083
+/Makefile/1.30/Fri Oct 24 09:17:31 2003//Tocaml3083
+/Makefile.nt/1.17.4.1/Mon Nov 29 08:50:23 2004//Tocaml3083
+/README/1.5/Sun Oct 26 09:35:41 2003//Tocaml3083
+/arith_flags.ml/1.4/Fri Dec  7 13:40:14 2001//Tocaml3083
+/arith_flags.mli/1.5/Fri Dec  7 13:40:14 2001//Tocaml3083
+/arith_status.ml/1.4/Fri Dec  7 13:40:14 2001//Tocaml3083
+/arith_status.mli/1.6/Fri Dec  7 13:40:14 2001//Tocaml3083
+/big_int.ml/1.18.4.1/Thu Mar 10 14:53:02 2005//Tocaml3083
+/big_int.mli/1.10/Thu Mar 14 20:12:54 2002//Tocaml3083
+/bng.c/1.2.6.1/Wed Dec 22 16:17:44 2004//Tocaml3083
+/bng.h/1.2/Fri Nov  7 07:59:09 2003//Tocaml3083
+/bng_alpha.c/1.1/Fri Oct 24 09:17:32 2003//Tocaml3083
+/bng_amd64.c/1.1/Fri Oct 24 09:17:33 2003//Tocaml3083
+/bng_digit.c/1.1/Fri Oct 24 09:17:33 2003//Tocaml3083
+/bng_ia32.c/1.3/Sun Oct 26 09:51:11 2003//Tocaml3083
+/bng_mips.c/1.1/Fri Oct 24 09:17:33 2003//Tocaml3083
+/bng_ppc.c/1.2/Mon Oct 27 08:41:46 2003//Tocaml3083
+/bng_sparc.c/1.1/Fri Oct 24 09:17:34 2003//Tocaml3083
+/int_misc.ml/1.6/Mon May 27 12:06:49 2002//Tocaml3083
+/int_misc.mli/1.4/Fri Dec  7 13:40:15 2001//Tocaml3083
+/nat.h/1.6/Fri Oct 24 09:17:34 2003//Tocaml3083
+/nat.ml/1.14/Fri Nov 21 15:59:38 2003//Tocaml3083
+/nat.mli/1.11/Fri Nov  7 07:59:09 2003//Tocaml3083
+/nat_stubs.c/1.14.4.1/Wed Dec 22 16:17:44 2004//Tocaml3083
+/num.ml/1.6/Fri Dec  7 13:40:16 2001//Tocaml3083
+/num.mli/1.8/Fri Dec 28 23:15:23 2001//Tocaml3083
+/ratio.ml/1.6/Fri Dec  7 13:40:16 2001//Tocaml3083
+/ratio.mli/1.4/Fri Dec  7 13:40:16 2001//Tocaml3083
+/string_misc.ml/1.4/Fri Dec  7 13:40:16 2001//Tocaml3083
+/string_misc.mli/1.4/Fri Dec  7 13:40:17 2001//Tocaml3083
+D

diff --git a/otherlibs/num/CVS/Entries.Log b/otherlibs/num/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..60e90cd
--- /dev/null
+++ b/otherlibs/num/CVS/Entries.Log
@@ -0,0 +1,2 @@
+A D/bignum////
+A D/test////

diff --git a/otherlibs/num/CVS/Repository b/otherlibs/num/CVS/Repository
new file mode 100644 (file)
index 0000000..3c45a8c
--- /dev/null
+++ b/otherlibs/num/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/num

diff --git a/otherlibs/num/CVS/Root b/otherlibs/num/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/num/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/num/CVS/Tag b/otherlibs/num/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/num/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/num/Makefile.nt b/otherlibs/num/Makefile.nt
index 06938d0a32b6eacc199e9829fbdd82670e44d8f3..2b60dd3bd4f349682916bc90fb3610d9e13a91c9 100644 (file)
--- a/otherlibs/num/Makefile.nt
+++ b/otherlibs/num/Makefile.nt
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile.nt,v 1.17 2003/10/24 09:17:31 xleroy Exp $
+# $Id: Makefile.nt,v 1.17.4.1 2004/11/29 08:50:23 xleroy Exp $
 
 # Makefile for the "num" (exact rational arithmetic) library
 
@@ -65,7 +65,6 @@ partialclean:
 
 clean: partialclean
        rm -f *.dll *.$(A) *.$(O)
-       cd bignum ; $(MAKEREC) scratch
        cd test ; $(MAKEREC) clean
 
 .SUFFIXES: .ml .mli .cmi .cmo .cmx .$(DO) .$(SO)

diff --git a/otherlibs/num/big_int.ml b/otherlibs/num/big_int.ml
index af666090423d1a20fed3866ebf4bb8e56d2a6ab7..843a3880effa1ca8637584bd011d26ee5aa1d7a1 100644 (file)
--- a/otherlibs/num/big_int.ml
+++ b/otherlibs/num/big_int.ml
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: big_int.ml,v 1.18 2003/12/29 19:26:15 doligez Exp $ *)
+(* $Id: big_int.ml,v 1.18.4.1 2005/03/10 14:53:02 doligez Exp $ *)
 
 open Int_misc
 open Nat
@@ -352,6 +352,7 @@ let sys_big_int_of_string_aux s ofs len sgn =
 ;;
 
 let sys_big_int_of_string s ofs len =
+  if len < 1 then failwith "sys_big_int_of_string";
   match s.[ofs] with
   | '-' -> sys_big_int_of_string_aux s (ofs+1) (len-1) (-1)
   | '+' -> sys_big_int_of_string_aux s (ofs+1) (len-1) 1

diff --git a/otherlibs/num/bignum/CVS/Entries b/otherlibs/num/bignum/CVS/Entries
new file mode 100644 (file)
index 0000000..ba7e268
--- /dev/null
+++ b/otherlibs/num/bignum/CVS/Entries
@@ -0,0 +1,2 @@
+/.cvsignore/1.1/Tue Dec 17 13:23:18 1996//Tocaml3083
+D

diff --git a/otherlibs/num/bignum/CVS/Entries.Log b/otherlibs/num/bignum/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..f38f88d
--- /dev/null
+++ b/otherlibs/num/bignum/CVS/Entries.Log
@@ -0,0 +1,8 @@
+A D/c////
+A D/h////
+A D/o////
+A D/s////
+R D/s////
+R D/o////
+R D/h////
+R D/c////

diff --git a/otherlibs/num/bignum/CVS/Repository b/otherlibs/num/bignum/CVS/Repository
new file mode 100644 (file)
index 0000000..63a240a
--- /dev/null
+++ b/otherlibs/num/bignum/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/num/bignum

diff --git a/otherlibs/num/bignum/CVS/Root b/otherlibs/num/bignum/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/num/bignum/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/num/bignum/CVS/Tag b/otherlibs/num/bignum/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/num/bignum/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/num/bng.c b/otherlibs/num/bng.c
index 2e6c274bf9ddfbde140d58b0115c7e4e9e46b4fc..79d358cbce546ffced3b5c8ca14bf8631eddf902 100644 (file)
--- a/otherlibs/num/bng.c
+++ b/otherlibs/num/bng.c
@@ -11,9 +11,10 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: bng.c,v 1.2 2003/11/07 07:59:09 xleroy Exp $ */
+/* $Id: bng.c,v 1.2.6.1 2004/12/22 16:17:44 doligez Exp $ */
 
 #include "bng.h"
+#include "config.h"
 
 #if defined(__GNUC__) && BNG_ASM_LEVEL > 0
 #if defined(BNG_ARCH_ia32)

diff --git a/otherlibs/num/nat_stubs.c b/otherlibs/num/nat_stubs.c
index c4eab96119e7542393877593334e41db3883c468..85d4363e3f1b867d6a6ba89dc94e80a8284fbc86 100644 (file)
--- a/otherlibs/num/nat_stubs.c
+++ b/otherlibs/num/nat_stubs.c
@@ -11,9 +11,10 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: nat_stubs.c,v 1.14 2003/11/07 07:59:09 xleroy Exp $ */
+/* $Id: nat_stubs.c,v 1.14.4.1 2004/12/22 16:17:44 doligez Exp $ */
 
 #include "alloc.h"
+#include "config.h"
 #include "custom.h"
 #include "intext.h"
 #include "fail.h"

diff --git a/otherlibs/num/test/CVS/Entries b/otherlibs/num/test/CVS/Entries
new file mode 100644 (file)
index 0000000..3d64691
--- /dev/null
+++ b/otherlibs/num/test/CVS/Entries
@@ -0,0 +1,12 @@
+/.depend/1.1/Mon Nov  6 13:09:04 1995//Tocaml3083
+/Makefile/1.9/Fri Oct 24 09:17:46 2003//Tocaml3083
+/Makefile.nt/1.9/Thu Apr  1 13:10:12 2004//Tocaml3083
+/end_test.ml/1.2/Tue Dec  4 14:24:43 2001//Tocaml3083
+/test.ml/1.4/Tue Dec  4 14:24:43 2001//Tocaml3083
+/test_big_ints.ml/1.8/Thu Mar 14 20:12:54 2002//Tocaml3083
+/test_bng.c/1.2/Fri Nov  7 07:59:10 2003//Tocaml3083
+/test_io.ml/1.1/Thu Feb 10 14:04:59 2000//Tocaml3083
+/test_nats.ml/1.4/Mon May 27 12:06:28 2002//Tocaml3083
+/test_nums.ml/1.1/Mon Nov  6 10:34:19 1995//Tocaml3083
+/test_ratios.ml/1.2/Thu Dec 28 13:05:10 2000//Tocaml3083
+D

diff --git a/otherlibs/num/test/CVS/Repository b/otherlibs/num/test/CVS/Repository
new file mode 100644 (file)
index 0000000..6b210ab
--- /dev/null
+++ b/otherlibs/num/test/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/num/test

diff --git a/otherlibs/num/test/CVS/Root b/otherlibs/num/test/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/num/test/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/num/test/CVS/Tag b/otherlibs/num/test/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/num/test/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/str/CVS/Entries b/otherlibs/str/CVS/Entries
new file mode 100644 (file)
index 0000000..c20c5ea
--- /dev/null
+++ b/otherlibs/str/CVS/Entries
@@ -0,0 +1,8 @@
+/.cvsignore/1.3/Thu Oct 11 12:04:39 2001//Tocaml3083
+/.depend/1.12/Mon Dec 15 18:10:51 2003//Tocaml3083
+/Makefile/1.31/Mon Dec  9 14:05:18 2002//Tocaml3083
+/Makefile.nt/1.14/Mon Dec  9 14:05:18 2002//Tocaml3083
+/str.ml/1.19/Tue Feb 17 10:13:50 2004//Tocaml3083
+/str.mli/1.23.2.1/Thu Mar 10 16:03:11 2005//Tocaml3083
+/strstubs.c/1.26/Mon May 17 17:10:00 2004//Tocaml3083
+D

diff --git a/otherlibs/str/CVS/Entries.Log b/otherlibs/str/CVS/Entries.Log
new file mode 100644 (file)
index 0000000..700c873
--- /dev/null
+++ b/otherlibs/str/CVS/Entries.Log
@@ -0,0 +1,2 @@
+A D/regex-0.12////
+R D/regex-0.12////

diff --git a/otherlibs/str/CVS/Repository b/otherlibs/str/CVS/Repository
new file mode 100644 (file)
index 0000000..2e913cc
--- /dev/null
+++ b/otherlibs/str/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/str

diff --git a/otherlibs/str/CVS/Root b/otherlibs/str/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/str/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/str/CVS/Tag b/otherlibs/str/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/str/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/str/str.mli b/otherlibs/str/str.mli
index 0ea879bc9b384c6d191bc4263ffb445aec56d16b..2cdeddd5e7807e99e8280e2d650f374bd48c0dc8 100644 (file)
--- a/otherlibs/str/str.mli
+++ b/otherlibs/str/str.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: str.mli,v 1.23 2004/04/13 17:12:46 doligez Exp $ *)
+(* $Id: str.mli,v 1.23.2.1 2005/03/10 16:03:11 doligez Exp $ *)
 
 (** Regular expressions and high-level string processing *)
 
@@ -73,8 +73,8 @@ val regexp_string_case_fold : string -> regexp
 
 
 val string_match : regexp -> string -> int -> bool
-(** [string_match r s start] tests whether the characters in [s]
-   starting at position [start] match the regular expression [r].
+(** [string_match r s start] tests whether a substring of [s] that
+   starts at position [start] matches the regular expression [r].
    The first character of a string has position [0], as usual. *)
 
 val search_forward : regexp -> string -> int -> int
@@ -93,9 +93,9 @@ val search_backward : regexp -> string -> int -> int
   substring matches. *)
 
 val string_partial_match : regexp -> string -> int -> bool
-(** Similar to {!Str.string_match}, but succeeds whenever the argument
-   string is a prefix of a string that matches.  This includes
-   the case of a true complete match. *)
+(** Similar to {!Str.string_match}, but also returns true if
+   the argument string is a prefix of a string that matches.
+   This includes the case of a true complete match. *)
 
 val matched_string : string -> string
 (** [matched_string s] returns the substring of [s] that was matched

diff --git a/otherlibs/systhreads/.depend b/otherlibs/systhreads/.depend
index e904871a169ca0494f551e49f1529d474a657832..694395ac382884e8141511496843d6f60c500134 100644 (file)
--- a/otherlibs/systhreads/.depend
+++ b/otherlibs/systhreads/.depend
@@ -17,8 +17,8 @@ win32.o: win32.c ../../byterun/alloc.h ../../byterun/compatibility.h \
 condition.cmi: mutex.cmi 
 condition.cmo: mutex.cmi condition.cmi 
 condition.cmx: mutex.cmx condition.cmi 
-event.cmo: condition.cmi mutex.cmi event.cmi 
-event.cmx: condition.cmx mutex.cmx event.cmi 
+event.cmo: mutex.cmi condition.cmi event.cmi 
+event.cmx: mutex.cmx condition.cmx event.cmi 
 mutex.cmo: mutex.cmi 
 mutex.cmx: mutex.cmi 
 thread.cmo: thread.cmi 

diff --git a/otherlibs/systhreads/CVS/Entries b/otherlibs/systhreads/CVS/Entries
new file mode 100644 (file)
index 0000000..c68e0ca
--- /dev/null
+++ b/otherlibs/systhreads/CVS/Entries
@@ -0,0 +1,18 @@
+/.cvsignore/1.2/Thu Oct 11 12:04:39 2001//Tocaml3083
+/.depend/1.12.4.1/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Makefile/1.35/Thu Aug 21 13:52:07 2003//Tocaml3083
+/Makefile.nt/1.29/Thu Jun 27 11:36:02 2002//Tocaml3083
+/condition.ml/1.6/Fri Dec  7 13:40:18 2001//Tocaml3083
+/condition.mli/1.6/Fri Dec  7 13:40:19 2001//Tocaml3083
+/event.ml/1.9/Fri Dec  7 13:40:19 2001//Tocaml3083
+/event.mli/1.9/Fri Dec  7 13:40:19 2001//Tocaml3083
+/mutex.ml/1.4/Fri Dec  7 13:40:19 2001//Tocaml3083
+/mutex.mli/1.6/Fri Dec  7 13:40:19 2001//Tocaml3083
+/posix.c/1.49.2.1/Thu Jul  1 09:32:38 2004//Tocaml3083
+/thread.mli/1.19/Fri Dec 28 23:14:48 2001//Tocaml3083
+/threadUnix.ml/1.8/Fri Dec  7 13:40:20 2001//Tocaml3083
+/threadUnix.mli/1.19/Wed Jun 26 09:48:00 2002//Tocaml3083
+/thread_posix.ml/1.9/Mon Jun 16 12:31:13 2003//Tocaml3083
+/thread_win32.ml/1.8/Fri Dec  7 13:40:20 2001//Tocaml3083
+/win32.c/1.38/Mon Dec 29 22:15:02 2003//Tocaml3083
+D

diff --git a/otherlibs/systhreads/CVS/Repository b/otherlibs/systhreads/CVS/Repository
new file mode 100644 (file)
index 0000000..e60e93b
--- /dev/null
+++ b/otherlibs/systhreads/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/systhreads

diff --git a/otherlibs/systhreads/CVS/Root b/otherlibs/systhreads/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/systhreads/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/systhreads/CVS/Tag b/otherlibs/systhreads/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/systhreads/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/threads/.depend b/otherlibs/threads/.depend
index fb931c6e44e9b9519c3f01d2eb1a455d5aba2704..b9ebac4703016b122e1f4ed4913939c5ed9a5417 100644 (file)
--- a/otherlibs/threads/.depend
+++ b/otherlibs/threads/.depend
@@ -10,10 +10,10 @@ scheduler.o: scheduler.c ../../byterun/alloc.h \
 condition.cmi: mutex.cmi 
 thread.cmi: unix.cmi 
 threadUnix.cmi: unix.cmi 
-condition.cmo: mutex.cmi thread.cmi condition.cmi 
-condition.cmx: mutex.cmx thread.cmx condition.cmi 
-event.cmo: condition.cmi mutex.cmi event.cmi 
-event.cmx: condition.cmx mutex.cmx event.cmi 
+condition.cmo: thread.cmi mutex.cmi condition.cmi 
+condition.cmx: thread.cmx mutex.cmx condition.cmi 
+event.cmo: mutex.cmi condition.cmi event.cmi 
+event.cmx: mutex.cmx condition.cmx event.cmi 
 marshal.cmo: pervasives.cmi marshal.cmi 
 marshal.cmx: pervasives.cmx marshal.cmi 
 mutex.cmo: thread.cmi mutex.cmi 
@@ -22,7 +22,7 @@ pervasives.cmo: unix.cmi pervasives.cmi
 pervasives.cmx: unix.cmx pervasives.cmi 
 thread.cmo: unix.cmi thread.cmi 
 thread.cmx: unix.cmx thread.cmi 
-threadUnix.cmo: thread.cmi unix.cmi threadUnix.cmi 
-threadUnix.cmx: thread.cmx unix.cmx threadUnix.cmi 
+threadUnix.cmo: unix.cmi thread.cmi threadUnix.cmi 
+threadUnix.cmx: unix.cmx thread.cmx threadUnix.cmi 
 unix.cmo: unix.cmi 
 unix.cmx: unix.cmi 

diff --git a/otherlibs/threads/CVS/Entries b/otherlibs/threads/CVS/Entries
new file mode 100644 (file)
index 0000000..c743e2b
--- /dev/null
+++ b/otherlibs/threads/CVS/Entries
@@ -0,0 +1,18 @@
+/.cvsignore/1.1/Fri Jan 18 15:13:25 2002//Tocaml3083
+/.depend/1.17.4.1/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Makefile/1.53/Thu Jul 17 08:38:28 2003//Tocaml3083
+/condition.ml/1.8/Fri Dec  7 13:40:21 2001//Tocaml3083
+/condition.mli/1.13/Fri Dec  7 13:40:21 2001//Tocaml3083
+/event.ml/1.14/Fri Dec  7 13:40:21 2001//Tocaml3083
+/event.mli/1.14/Fri Dec  7 13:40:21 2001//Tocaml3083
+/marshal.ml/1.9/Thu May 27 15:28:05 2004//Tocaml3083
+/mutex.ml/1.8/Fri Dec  7 13:40:22 2001//Tocaml3083
+/mutex.mli/1.11/Fri Dec  7 13:40:22 2001//Tocaml3083
+/pervasives.ml/1.48.4.1/Tue Jun 22 12:13:46 2004//Tocaml3083
+/scheduler.c/1.58/Mon Dec 29 22:15:02 2003//Tocaml3083
+/thread.ml/1.23/Thu Mar 20 16:23:04 2003//Tocaml3083
+/thread.mli/1.27.6.1/Wed Jun 30 09:32:40 2004//Tocaml3083
+/threadUnix.ml/1.18.6.1/Tue Jun 22 17:18:49 2004//Tocaml3083
+/threadUnix.mli/1.21.6.1/Tue Jun 22 17:18:49 2004//Tocaml3083
+/unix.ml/1.16.2.2/Sat Nov  6 10:14:58 2004//Tocaml3083
+D

diff --git a/otherlibs/threads/CVS/Repository b/otherlibs/threads/CVS/Repository
new file mode 100644 (file)
index 0000000..f5537e0
--- /dev/null
+++ b/otherlibs/threads/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/threads

diff --git a/otherlibs/threads/CVS/Root b/otherlibs/threads/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/threads/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/threads/CVS/Tag b/otherlibs/threads/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/threads/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/unix/.depend b/otherlibs/unix/.depend
index 045cd7f71efd9e44b64c2b6eac30d01331afba90..8f0685aeaf12f403ae5debac9134b0d1d428762e 100644 (file)
--- a/otherlibs/unix/.depend
+++ b/otherlibs/unix/.depend
@@ -1,9 +1,9 @@
 accept.o: accept.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h socketaddr.h
 access.o: access.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
@@ -14,9 +14,9 @@ addrofstr.o: addrofstr.c ../../byterun/mlvalues.h \
 alarm.o: alarm.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-bind.o: bind.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h socketaddr.h
+bind.o: bind.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h socketaddr.h
 chdir.o: chdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
@@ -35,9 +35,9 @@ close.o: close.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 closedir.o: closedir.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h unixsupport.h
-connect.o: connect.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/signals.h \
+connect.o: connect.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h ../../byterun/signals.h \
   unixsupport.h socketaddr.h
 cst2constr.o: cst2constr.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
@@ -77,30 +77,33 @@ execvp.o: execvp.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 exit.o: exit.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-fchmod.o: fchmod.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
-fchown.o: fchown.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
-fcntl.o: fcntl.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+fchmod.o: fchmod.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
+fchown.o: fchown.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
+fcntl.o: fcntl.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 fork.o: fork.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-ftruncate.o: ftruncate.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/io.h unixsupport.h
+ftruncate.o: ftruncate.c ../../byterun/fail.h \
+  ../../byterun/compatibility.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/mlvalues.h ../../byterun/io.h unixsupport.h
 getaddrinfo.o: getaddrinfo.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
-  ../../byterun/signals.h unixsupport.h cst2constr.h socketaddr.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+  cst2constr.h socketaddr.h
 getcwd.o: getcwd.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  unixsupport.h
 getegid.o: getegid.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h unixsupport.h
@@ -118,17 +121,18 @@ getgr.o: getgr.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 getgroups.o: getgroups.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 gethost.o: gethost.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
-  ../../byterun/signals.h unixsupport.h socketaddr.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+  socketaddr.h
 gethostname.o: gethostname.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 getlogin.o: getlogin.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
@@ -136,12 +140,14 @@ getlogin.o: getlogin.c ../../byterun/mlvalues.h \
 getnameinfo.o: getnameinfo.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
-  ../../byterun/signals.h unixsupport.h socketaddr.h
-getpeername.o: getpeername.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h unixsupport.h socketaddr.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+  socketaddr.h
+getpeername.o: getpeername.c ../../byterun/fail.h \
+  ../../byterun/compatibility.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/mlvalues.h unixsupport.h socketaddr.h
 getpid.o: getpid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
@@ -151,9 +157,9 @@ getppid.o: getppid.c ../../byterun/mlvalues.h \
 getproto.o: getproto.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
-  unixsupport.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h unixsupport.h
 getpw.o: getpw.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
@@ -162,29 +168,30 @@ getpw.o: getpw.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 getserv.o: getserv.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
-  unixsupport.h
-getsockname.o: getsockname.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h unixsupport.h socketaddr.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h unixsupport.h
+getsockname.o: getsockname.c ../../byterun/fail.h \
+  ../../byterun/compatibility.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/mlvalues.h unixsupport.h socketaddr.h
 gettimeofday.o: gettimeofday.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 getuid.o: getuid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
 gmtime.o: gmtime.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 itimer.o: itimer.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 kill.o: kill.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/fail.h unixsupport.h \
@@ -192,12 +199,13 @@ kill.o: kill.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 link.o: link.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-listen.o: listen.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
-lockf.o: lockf.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/signals.h unixsupport.h
+listen.o: listen.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
+lockf.o: lockf.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h ../../byterun/signals.h \
+  unixsupport.h
 lseek.o: lseek.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/io.h \
@@ -205,9 +213,9 @@ lseek.o: lseek.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 mkdir.o: mkdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-mkfifo.o: mkfifo.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+mkfifo.o: mkfifo.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 nice.o: nice.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
@@ -223,10 +231,10 @@ opendir.o: opendir.c ../../byterun/mlvalues.h \
 pipe.o: pipe.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
-putenv.o: putenv.c ../../byterun/memory.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/misc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
+putenv.o: putenv.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h ../../byterun/memory.h \
+  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h unixsupport.h
 read.o: read.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
@@ -240,50 +248,54 @@ readdir.o: readdir.c ../../byterun/mlvalues.h \
 readlink.o: readlink.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 rename.o: rename.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-rewinddir.o: rewinddir.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h unixsupport.h
+rewinddir.o: rewinddir.c ../../byterun/fail.h \
+  ../../byterun/compatibility.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/mlvalues.h unixsupport.h
 rmdir.o: rmdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
 select.o: select.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h
 sendrecv.o: sendrecv.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h \
-  ../../byterun/signals.h unixsupport.h socketaddr.h
+  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+  socketaddr.h
 setgid.o: setgid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-setsid.o: setsid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+setsid.o: setsid.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 setuid.o: setuid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-shutdown.o: shutdown.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h unixsupport.h
+shutdown.o: shutdown.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 signals.o: signals.c ../../byterun/alloc.h ../../byterun/compatibility.h \
   ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/mlvalues.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+  ../../config/s.h ../../byterun/mlvalues.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h
 sleep.o: sleep.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/signals.h unixsupport.h
-socket.o: socket.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+socket.o: socket.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 socketaddr.o: socketaddr.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
@@ -293,11 +305,11 @@ socketaddr.o: socketaddr.c ../../byterun/mlvalues.h \
 socketpair.o: socketpair.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 sockopt.o: sockopt.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h socketaddr.h
+  ../../byterun/fail.h unixsupport.h socketaddr.h
 stat.o: stat.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
@@ -307,14 +319,14 @@ stat.o: stat.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
 strofaddr.o: strofaddr.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h socketaddr.h
-symlink.o: symlink.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h unixsupport.h
+  ../../byterun/fail.h unixsupport.h socketaddr.h
+symlink.o: symlink.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 termios.o: termios.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
   ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  unixsupport.h
+  ../../byterun/fail.h unixsupport.h
 time.o: time.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
@@ -325,7 +337,8 @@ times.o: times.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/minor_gc.h unixsupport.h
 truncate.o: truncate.c ../../byterun/mlvalues.h \
   ../../byterun/compatibility.h ../../byterun/config.h ../../config/m.h \
-  ../../config/s.h ../../byterun/misc.h ../../byterun/io.h unixsupport.h
+  ../../config/s.h ../../byterun/misc.h ../../byterun/fail.h \
+  ../../byterun/io.h unixsupport.h
 umask.o: umask.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
@@ -339,14 +352,15 @@ unixsupport.o: unixsupport.c ../../byterun/mlvalues.h \
 unlink.o: unlink.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h unixsupport.h
-utimes.o: utimes.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+utimes.o: utimes.c ../../byterun/fail.h ../../byterun/compatibility.h \
+  ../../byterun/misc.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/mlvalues.h unixsupport.h
 wait.o: wait.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h
 write.o: write.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
   ../../byterun/config.h ../../config/m.h ../../config/s.h \
   ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \

diff --git a/otherlibs/unix/CVS/Entries b/otherlibs/unix/CVS/Entries
new file mode 100644 (file)
index 0000000..fc06dc3
--- /dev/null
+++ b/otherlibs/unix/CVS/Entries
@@ -0,0 +1,103 @@
+/.cvsignore/1.1/Thu Oct 11 12:04:40 2001//Tocaml3083
+/.depend/1.23.2.2/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Makefile/1.38/Fri Apr  9 13:25:20 2004//Tocaml3083
+/accept.c/1.12.6.2/Wed Jan 12 15:08:56 2005//Tocaml3083
+/access.c/1.10.6.1/Tue Nov  2 16:21:25 2004//Tocaml3083
+/addrofstr.c/1.11/Fri Apr  9 13:25:20 2004//Tocaml3083
+/alarm.c/1.7.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/bind.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/chdir.c/1.8/Fri Dec  7 13:40:24 2001//Tocaml3083
+/chmod.c/1.9/Fri Dec  7 13:40:26 2001//Tocaml3083
+/chown.c/1.8/Fri Dec  7 13:40:26 2001//Tocaml3083
+/chroot.c/1.8/Fri Dec  7 13:40:26 2001//Tocaml3083
+/close.c/1.10/Fri Dec  7 13:40:26 2001//Tocaml3083
+/closedir.c/1.9/Sat Feb 14 10:21:22 2004//Tocaml3083
+/connect.c/1.11.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/cst2constr.c/1.7/Fri Dec  7 13:40:26 2001//Tocaml3083
+/cst2constr.h/1.7/Fri Apr  9 13:25:21 2004//Tocaml3083
+/cstringv.c/1.7/Fri Dec  7 13:40:27 2001//Tocaml3083
+/dup.c/1.8/Fri Dec  7 13:40:27 2001//Tocaml3083
+/dup2.c/1.9/Fri Dec  7 13:40:27 2001//Tocaml3083
+/envir.c/1.9.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/errmsg.c/1.12/Sun May 23 15:53:50 2004//Tocaml3083
+/execv.c/1.8/Fri Dec  7 13:40:27 2001//Tocaml3083
+/execve.c/1.8/Fri Dec  7 13:40:27 2001//Tocaml3083
+/execvp.c/1.8/Fri Dec  7 13:40:27 2001//Tocaml3083
+/exit.c/1.9/Fri Dec  7 13:40:28 2001//Tocaml3083
+/fchmod.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/fchown.c/1.8.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/fcntl.c/1.11.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/fork.c/1.8/Fri Dec  7 13:40:28 2001//Tocaml3083
+/ftruncate.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getaddrinfo.c/1.1.4.2/Wed Jan 12 15:08:56 2005//Tocaml3083
+/getcwd.c/1.14.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getegid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/geteuid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/getgid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/getgr.c/1.12/Fri Dec  7 13:40:29 2001//Tocaml3083
+/getgroups.c/1.10.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/gethost.c/1.24.2.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/gethostname.c/1.10.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getlogin.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/getnameinfo.c/1.1.4.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getpeername.c/1.10.2.2/Wed Jan 12 15:08:56 2005//Tocaml3083
+/getpid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/getppid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/getproto.c/1.12.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getpw.c/1.12/Fri Dec  7 13:40:30 2001//Tocaml3083
+/getserv.c/1.13.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getsockname.c/1.9.6.2/Wed Jan 12 15:08:56 2005//Tocaml3083
+/gettimeofday.c/1.7.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/getuid.c/1.8.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/gmtime.c/1.16.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/itimer.c/1.13.4.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/kill.c/1.10/Fri Dec  7 13:40:31 2001//Tocaml3083
+/link.c/1.8/Fri Dec  7 13:40:31 2001//Tocaml3083
+/listen.c/1.10.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/lockf.c/1.13.2.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/lseek.c/1.10/Sat Mar  2 09:16:36 2002//Tocaml3083
+/mkdir.c/1.9/Fri Dec  7 13:40:31 2001//Tocaml3083
+/mkfifo.c/1.10.6.2/Mon Jan 17 18:10:36 2005//Tocaml3083
+/nice.c/1.10/Fri Dec  7 13:40:32 2001//Tocaml3083
+/open.c/1.11.6.1/Tue Nov  2 16:21:25 2004//Tocaml3083
+/opendir.c/1.9/Sat Feb 14 10:21:22 2004//Tocaml3083
+/pipe.c/1.9.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/putenv.c/1.8.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/read.c/1.13/Fri Dec  7 13:40:32 2001//Tocaml3083
+/readdir.c/1.12/Sat Feb 14 10:21:23 2004//Tocaml3083
+/readlink.c/1.10.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/rename.c/1.10/Fri Dec  7 13:40:33 2001//Tocaml3083
+/rewinddir.c/1.11.2.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/rmdir.c/1.9/Fri Dec  7 13:40:33 2001//Tocaml3083
+/select.c/1.21.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/sendrecv.c/1.18.6.4/Mon Jan 17 18:10:36 2005//Tocaml3083
+/setgid.c/1.8/Fri Dec  7 13:40:33 2001//Tocaml3083
+/setsid.c/1.5.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/setuid.c/1.8/Fri Dec  7 13:40:33 2001//Tocaml3083
+/shutdown.c/1.10.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/signals.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/sleep.c/1.9/Fri Dec  7 13:40:35 2001//Tocaml3083
+/socket.c/1.10.2.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/socketaddr.c/1.22.2.2/Mon Jan 17 18:10:36 2005//Tocaml3083
+/socketaddr.h/1.15.2.2/Mon Jan 17 18:10:36 2005//Tocaml3083
+/socketpair.c/1.11.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/sockopt.c/1.18.6.2/Mon Jan 17 18:10:36 2005//Tocaml3083
+/stat.c/1.15/Mon May  5 14:20:58 2003//Tocaml3083
+/strofaddr.c/1.9.2.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/symlink.c/1.8.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/termios.c/1.14.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/time.c/1.9.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/times.c/1.14.6.1/Mon Jan 17 18:10:36 2005//Tocaml3083
+/truncate.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/umask.c/1.9/Fri Dec  7 13:40:37 2001//Tocaml3083
+/unix.ml/1.60.2.3/Sat Nov  6 10:14:58 2004//Tocaml3083
+/unix.mli/1.79.2.4/Wed Dec 22 16:11:13 2004//Tocaml3083
+/unixLabels.ml/1.3/Fri Dec  7 13:40:38 2001//Tocaml3083
+/unixLabels.mli/1.12.2.2/Fri Jul  2 09:37:17 2004//Tocaml3083
+/unixsupport.c/1.17/Sat Mar  2 09:16:38 2002//Tocaml3083
+/unixsupport.h/1.7/Sat Feb 14 10:21:23 2004//Tocaml3083
+/unlink.c/1.8/Fri Dec  7 13:40:39 2001//Tocaml3083
+/utimes.c/1.9.6.1/Mon Aug 23 11:31:44 2004//Tocaml3083
+/wait.c/1.17.6.3/Mon Jan 17 18:10:36 2005//Tocaml3083
+/write.c/1.13.6.3/Thu Jul  8 08:40:47 2004//Tocaml3083
+D

diff --git a/otherlibs/unix/CVS/Repository b/otherlibs/unix/CVS/Repository
new file mode 100644 (file)
index 0000000..0df35a0
--- /dev/null
+++ b/otherlibs/unix/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/unix

diff --git a/otherlibs/unix/CVS/Root b/otherlibs/unix/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/unix/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/unix/CVS/Tag b/otherlibs/unix/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/unix/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/unix/accept.c b/otherlibs/unix/accept.c
index b4d4e3faeb9e08f21db6f8d24e91d6003c727e90..50041d6056a321c6c836f427b4ebc5c35396ba11 100644 (file)
--- a/otherlibs/unix/accept.c
+++ b/otherlibs/unix/accept.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: accept.c,v 1.12.6.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: accept.c,v 1.12.6.2 2005/01/12 15:08:56 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -37,7 +37,7 @@ CAMLprim value unix_accept(value sock)
   retcode = accept(Int_val(sock), &addr.s_gen, &addr_len);
   leave_blocking_section();
   if (retcode == -1) uerror("accept", Nothing);
-  a = alloc_sockaddr(&addr, addr_len);
+  a = alloc_sockaddr(&addr, addr_len, retcode);
   Begin_root (a);
     res = alloc_small(2, 0);
     Field(res, 0) = Val_int(retcode);

diff --git a/otherlibs/unix/alarm.c b/otherlibs/unix/alarm.c
index 299866a210b07ae9daaa3de442bc65b3d4f8de38..f6957e5a0773e168efcf9a7e3697b1e6cb91b3ae 100644 (file)
--- a/otherlibs/unix/alarm.c
+++ b/otherlibs/unix/alarm.c
@@ -11,13 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: alarm.c,v 1.7 2001/12/07 13:40:24 xleroy Exp $ */
+/* $Id: alarm.c,v 1.7.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_alarm(t)
-     value t;
+CAMLprim value unix_alarm(value t)
 {
   return Val_int(alarm((unsigned int) Long_val(t)));
 }

diff --git a/otherlibs/unix/envir.c b/otherlibs/unix/envir.c
index 3ba05b1e69ce624f7e9d4096e5bae6b3e1021235..1794dc29093bbd7b1624d733f16741ed9186f146 100644 (file)
--- a/otherlibs/unix/envir.c
+++ b/otherlibs/unix/envir.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: envir.c,v 1.9 2001/12/07 13:40:27 xleroy Exp $ */
+/* $Id: envir.c,v 1.9.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -20,7 +20,7 @@
 extern char ** environ;
 #endif
 
-CAMLprim value unix_environment(void)
+CAMLprim value unix_environment(value unit)
 {
   return copy_string_array((const char**)environ);
 }

diff --git a/otherlibs/unix/getaddrinfo.c b/otherlibs/unix/getaddrinfo.c
index 2611c2a83d6810fe80452373a08adfdcd260c841..637e64dd9b07ad8bf92b63e59ce12e2f3f0d66e0 100644 (file)
--- a/otherlibs/unix/getaddrinfo.c
+++ b/otherlibs/unix/getaddrinfo.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getaddrinfo.c,v 1.1.4.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: getaddrinfo.c,v 1.1.4.2 2005/01/12 15:08:56 doligez Exp $ */
 
 #include <string.h>
 #include <mlvalues.h>
@@ -40,7 +40,7 @@ static value convert_addrinfo(struct addrinfo * a)
   union sock_addr_union sa;
 
   memcpy(&sa.s_gen, a->ai_addr, sizeof(struct sockaddr));
-  vaddr = alloc_sockaddr(&sa, sizeof(struct sockaddr));
+  vaddr = alloc_sockaddr(&sa, sizeof(struct sockaddr), -1);
   vcanonname = copy_string(a->ai_canonname == NULL ? "" : a->ai_canonname);
   vres = alloc_small(5, 0);
   Field(vres, 0) = cst_to_constr(a->ai_family, socket_domain_table, 3, 0);

diff --git a/otherlibs/unix/getegid.c b/otherlibs/unix/getegid.c
index aa32fa460f0df9d3c19d58e7aa53cef84db1043e..a9e3d7c359395255f642b67ec7e7aaf80411ff6a 100644 (file)
--- a/otherlibs/unix/getegid.c
+++ b/otherlibs/unix/getegid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getegid.c,v 1.8 2001/12/07 13:40:28 xleroy Exp $ */
+/* $Id: getegid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_getegid(void)
+CAMLprim value unix_getegid(value unit)
 {
   return Val_int(getegid());
 }

diff --git a/otherlibs/unix/geteuid.c b/otherlibs/unix/geteuid.c
index 0130157e288840ca400513b562439342f0c554d7..af799ef90cc4b590ef68f3fd744ac82d8b9dffe5 100644 (file)
--- a/otherlibs/unix/geteuid.c
+++ b/otherlibs/unix/geteuid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: geteuid.c,v 1.8 2001/12/07 13:40:29 xleroy Exp $ */
+/* $Id: geteuid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_geteuid(void)
+CAMLprim value unix_geteuid(value unit)
 {
   return Val_int(geteuid());
 }

diff --git a/otherlibs/unix/getgid.c b/otherlibs/unix/getgid.c
index 434e9c33d3260e3824cf23c3b8a4b6ef52c12f34..339c78dcdce61f2fd52c0448cca09128b36bafa5 100644 (file)
--- a/otherlibs/unix/getgid.c
+++ b/otherlibs/unix/getgid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getgid.c,v 1.8 2001/12/07 13:40:29 xleroy Exp $ */
+/* $Id: getgid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_getgid(void)
+CAMLprim value unix_getgid(value unit)
 {
   return Val_int(getgid());
 }

diff --git a/otherlibs/unix/getlogin.c b/otherlibs/unix/getlogin.c
index 5b0b806ea128979a830707124dff4d7d1f1021a1..d88f5348a7ad076e37bc4ff9c8706d7fd2aa94c5 100644 (file)
--- a/otherlibs/unix/getlogin.c
+++ b/otherlibs/unix/getlogin.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getlogin.c,v 1.8 2001/12/07 13:40:29 xleroy Exp $ */
+/* $Id: getlogin.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -20,7 +20,7 @@
 
 extern char * getlogin(void);
 
-CAMLprim value unix_getlogin(void)
+CAMLprim value unix_getlogin(value unit)
 {
   char * name;
   name = getlogin();

diff --git a/otherlibs/unix/getpeername.c b/otherlibs/unix/getpeername.c
index 67879c5cad5539f57e2078a3466138d46732df2f..59be3628ff762271335039deb35d075b785eb59c 100644 (file)
--- a/otherlibs/unix/getpeername.c
+++ b/otherlibs/unix/getpeername.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getpeername.c,v 1.10.2.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: getpeername.c,v 1.10.2.2 2005/01/12 15:08:56 doligez Exp $ */
 
 #include <fail.h>
 #include <mlvalues.h>
@@ -30,7 +30,7 @@ CAMLprim value unix_getpeername(value sock)
   addr_len = sizeof(addr);
   retcode = getpeername(Int_val(sock), &addr.s_gen, &addr_len);
   if (retcode == -1) uerror("getpeername", Nothing);
-  return alloc_sockaddr(&addr, addr_len);
+  return alloc_sockaddr(&addr, addr_len, -1);
 }
 
 #else

diff --git a/otherlibs/unix/getpid.c b/otherlibs/unix/getpid.c
index 5d64c3e9adecb745839eb5864953af9e278e51cb..9eaa37ee15b85e2abd00d64c92415b992d52ab5c 100644 (file)
--- a/otherlibs/unix/getpid.c
+++ b/otherlibs/unix/getpid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getpid.c,v 1.8 2001/12/07 13:40:30 xleroy Exp $ */
+/* $Id: getpid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_getpid(void)
+CAMLprim value unix_getpid(value unit)
 {
   return Val_int(getpid());
 }

diff --git a/otherlibs/unix/getppid.c b/otherlibs/unix/getppid.c
index e522e9f851ba15ef6efef2294c7422a72a9cb2b8..22380b247cc4102d25c1a542a319858fa91301aa 100644 (file)
--- a/otherlibs/unix/getppid.c
+++ b/otherlibs/unix/getppid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getppid.c,v 1.8 2001/12/07 13:40:30 xleroy Exp $ */
+/* $Id: getppid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_getppid(void)
+CAMLprim value unix_getppid(value unit)
 {
   return Val_int(getppid());
 }

diff --git a/otherlibs/unix/getsockname.c b/otherlibs/unix/getsockname.c
index 99026867dcc8e9a47d9be4bd5e5ac4af1812b694..a75ce4b441f61badfcdb656a6288dc7d2a8692a4 100644 (file)
--- a/otherlibs/unix/getsockname.c
+++ b/otherlibs/unix/getsockname.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getsockname.c,v 1.9.6.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: getsockname.c,v 1.9.6.2 2005/01/12 15:08:56 doligez Exp $ */
 
 #include <fail.h>
 #include <mlvalues.h>
@@ -30,7 +30,7 @@ CAMLprim value unix_getsockname(value sock)
   addr_len = sizeof(addr);
   retcode = getsockname(Int_val(sock), &addr.s_gen, &addr_len);
   if (retcode == -1) uerror("getsockname", Nothing);
-  return alloc_sockaddr(&addr, addr_len);
+  return alloc_sockaddr(&addr, addr_len, -1);
 }
 
 #else

diff --git a/otherlibs/unix/getuid.c b/otherlibs/unix/getuid.c
index 8b4bddd2aa72dc3a8ed36f9cb6af4521432ea950..d44deaa84165d75779377bcf923fde1ad38c8463 100644 (file)
--- a/otherlibs/unix/getuid.c
+++ b/otherlibs/unix/getuid.c
@@ -11,12 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getuid.c,v 1.8 2001/12/07 13:40:30 xleroy Exp $ */
+/* $Id: getuid.c,v 1.8.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_getuid(void)
+CAMLprim value unix_getuid(value unit)
 {
   return Val_int(getuid());
 }

diff --git a/otherlibs/unix/mkfifo.c b/otherlibs/unix/mkfifo.c
index 9e55dbb869c12ff103f9b14ee1da24963ef55a5a..e543fe97e363859fb3a35d67a72b7957838affa5 100644 (file)
--- a/otherlibs/unix/mkfifo.c
+++ b/otherlibs/unix/mkfifo.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: mkfifo.c,v 1.10.6.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: mkfifo.c,v 1.10.6.2 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -44,7 +44,10 @@ CAMLprim value unix_mkfifo(value path, value mode)
 
 #else
 
-CAMLprim value unix_mkfifo() { invalid_argument("mkfifo not implemented"); }
+CAMLprim value unix_mkfifo(value path, value mode)
+{
+  invalid_argument("mkfifo not implemented");
+}
 
 #endif
 #endif

diff --git a/otherlibs/unix/pipe.c b/otherlibs/unix/pipe.c
index d634ea9ab64c1255244e24445ec258d165233f4d..deaed808177f597093a234f1bb15d1337e8c7f7b 100644 (file)
--- a/otherlibs/unix/pipe.c
+++ b/otherlibs/unix/pipe.c
@@ -11,13 +11,13 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: pipe.c,v 1.9 2001/12/07 13:40:32 xleroy Exp $ */
+/* $Id: pipe.c,v 1.9.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_pipe(void)
+CAMLprim value unix_pipe(value unit)
 {
   int fd[2];
   value res;

diff --git a/otherlibs/unix/sendrecv.c b/otherlibs/unix/sendrecv.c
index b7e59b7d93e0b3c6e7b5056254afc51d205c4ef1..87b2cddae390aa9f35a931fccaafcb0b046a4b6a 100644 (file)
--- a/otherlibs/unix/sendrecv.c
+++ b/otherlibs/unix/sendrecv.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: sendrecv.c,v 1.18.6.2 2004/11/02 16:21:25 doligez Exp $ */
+/* $Id: sendrecv.c,v 1.18.6.4 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <string.h>
 #include <mlvalues.h>
@@ -28,7 +28,8 @@ static int msg_flag_table[] = {
   MSG_OOB, MSG_DONTROUTE, MSG_PEEK
 };
 
-CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_recv(value sock, value buff, value ofs, value len,
+                         value flags)
 {
   int ret, cv_flags;
   long numbytes;
@@ -47,7 +48,8 @@ CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value fla
   return Val_int(ret);
 }
 
-CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len,
+                             value flags)
 {
   int ret, cv_flags;
   long numbytes;
@@ -68,7 +70,7 @@ CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value
     leave_blocking_section();
     if (ret == -1) uerror("recvfrom", Nothing);
     memmove (&Byte(buff, Long_val(ofs)), iobuf, ret);
-    adr = alloc_sockaddr(&addr, addr_len);
+    adr = alloc_sockaddr(&addr, addr_len, -1);
     res = alloc_small(2, 0);
     Field(res, 0) = Val_int(ret);
     Field(res, 1) = adr;
@@ -76,7 +78,8 @@ CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value
   return res;
 }
 
-CAMLprim value unix_send(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_send(value sock, value buff, value ofs, value len,
+                         value flags)
 {
   int ret, cv_flags;
   long numbytes;
@@ -93,7 +96,8 @@ CAMLprim value unix_send(value sock, value buff, value ofs, value len, value fla
   return Val_int(ret);
 }
 
-CAMLprim value unix_sendto_native(value sock, value buff, value ofs, value len, value flags, value dest)
+CAMLprim value unix_sendto_native(value sock, value buff, value ofs, value len,
+                                  value flags, value dest)
 {
   int ret, cv_flags;
   long numbytes;
@@ -122,16 +126,20 @@ CAMLprim value unix_sendto(value *argv, int argc)
 
 #else
 
-CAMLprim value unix_recv(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_recv(value sock, value buff, value ofs, value len,
+                         value flags)
 { invalid_argument("recv not implemented"); }
 
-CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len,
+                             value flags)
 { invalid_argument("recvfrom not implemented"); }
 
-CAMLprim value unix_send(value sock, value buff, value ofs, value len, value flags)
+CAMLprim value unix_send(value sock, value buff, value ofs, value len,
+                         value flags)
 { invalid_argument("send not implemented"); }
 
-CAMLprim value unix_sendto_native(value sock, value buff, value ofs, value len, value flags, value dest)
+CAMLprim value unix_sendto_native(value sock, value buff, value ofs, value len,
+                                  value flags, value dest)
 { invalid_argument("sendto not implemented"); }
 
 CAMLprim value unix_sendto(value *argv, int argc)

diff --git a/otherlibs/unix/socketaddr.c b/otherlibs/unix/socketaddr.c
index 6691a69e8d547ef74c580310e26f24c61cf90a49..c7a6bf0c1d9a4507e8b33909bb3ac3d47a7fcf49 100644 (file)
--- a/otherlibs/unix/socketaddr.c
+++ b/otherlibs/unix/socketaddr.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: socketaddr.c,v 1.22 2004/04/09 13:25:22 xleroy Exp $ */
+/* $Id: socketaddr.c,v 1.22.2.2 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <string.h>
 #include <mlvalues.h>
@@ -28,7 +28,7 @@
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
 #endif
 
-CAMLprim value alloc_inet_addr(struct in_addr * a)
+CAMLexport value alloc_inet_addr(struct in_addr * a)
 {
   value res;
   /* Use a string rather than an abstract block so that it can be
@@ -41,7 +41,7 @@ CAMLprim value alloc_inet_addr(struct in_addr * a)
 
 #ifdef HAS_IPV6
 
-CAMLprim value alloc_inet6_addr(struct in6_addr * a)
+CAMLexport value alloc_inet6_addr(struct in6_addr * a)
 {
   value res;
   res = alloc_string(16);
@@ -94,7 +94,7 @@ void get_sockaddr(value mladr,
 }
 
 value alloc_sockaddr(union sock_addr_union * adr /*in*/,
-                     socklen_param_type adr_len)
+                     socklen_param_type adr_len, int close_on_error)
 {
   value res;
   switch(adr->s_gen.sa_family) {
@@ -129,6 +129,7 @@ value alloc_sockaddr(union sock_addr_union * adr /*in*/,
     }
 #endif
   default:
+    if (close_on_error != -1) close (close_on_error);
     unix_error(EAFNOSUPPORT, "", Nothing);
   }
   return res;

diff --git a/otherlibs/unix/socketaddr.h b/otherlibs/unix/socketaddr.h
index 507f7bb0b9cf136997ffb3147552c0321f3f2a18..dca6551a88c250b766acef2cae89afaba69af0f1 100644 (file)
--- a/otherlibs/unix/socketaddr.h
+++ b/otherlibs/unix/socketaddr.h
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: socketaddr.h,v 1.15 2004/04/09 13:25:22 xleroy Exp $ */
+/* $Id: socketaddr.h,v 1.15.2.2 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <misc.h>
 #include <sys/types.h>
@@ -38,12 +38,12 @@ typedef int socklen_param_type;
 extern void get_sockaddr (value mladdr,
                           union sock_addr_union * addr /*out*/,
                           socklen_param_type * addr_len /*out*/);
-CAMLprim value alloc_sockaddr (union sock_addr_union * addr /*in*/,
-                      socklen_param_type addr_len);
-CAMLprim value alloc_inet_addr (struct in_addr * inaddr);
+CAMLexport value alloc_sockaddr (union sock_addr_union * addr /*in*/,
+                      socklen_param_type addr_len, int close_on_error);
+CAMLexport value alloc_inet_addr (struct in_addr * inaddr);
 #define GET_INET_ADDR(v) (*((struct in_addr *) (v)))
 
 #ifdef HAS_IPV6
-CAMLprim value alloc_inet6_addr (struct in6_addr * inaddr);
+CAMLexport value alloc_inet6_addr (struct in6_addr * inaddr);
 #define GET_INET6_ADDR(v) (*((struct in6_addr *) (v)))
 #endif

diff --git a/otherlibs/unix/sockopt.c b/otherlibs/unix/sockopt.c
index 11e9b0108b7ed80b0eb44b427d4e41a62baacfd2..8ec88f103f9963b8046a383b4ed21458f8190821 100644 (file)
--- a/otherlibs/unix/sockopt.c
+++ b/otherlibs/unix/sockopt.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: sockopt.c,v 1.18.6.1 2004/08/23 11:31:44 doligez Exp $ */
+/* $Id: sockopt.c,v 1.18.6.2 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -86,8 +86,8 @@ static int sockopt_optint[] = { SO_LINGER };
 
 static int sockopt_float[] = { SO_RCVTIMEO, SO_SNDTIMEO };
 
-CAMLprim value getsockopt_int(int *sockopt, value socket,
-                              int level, value option)
+CAMLexport value getsockopt_int(int *sockopt, value socket,
+                                int level, value option)
 {
   int optval;
   socklen_param_type optsize;
@@ -99,8 +99,8 @@ CAMLprim value getsockopt_int(int *sockopt, value socket,
   return Val_int(optval);
 }
 
-CAMLprim value setsockopt_int(int *sockopt, value socket, int level,
-                              value option, value status)
+CAMLexport value setsockopt_int(int *sockopt, value socket, int level,
+                                value option, value status)
 {
   int optval = Int_val(status);
   if (setsockopt(Int_val(socket), level, sockopt[Int_val(option)],
@@ -128,8 +128,8 @@ CAMLprim value unix_setsockopt_int(value socket, value option, value status)
  return setsockopt_int(sockopt_int, socket, SOL_SOCKET, option, status);
 }
 
-CAMLprim value getsockopt_optint(int *sockopt, value socket,
-                                 int level, value option)
+CAMLexport value getsockopt_optint(int *sockopt, value socket,
+                                   int level, value option)
 {
   struct linger optval;
   socklen_param_type optsize;
@@ -146,8 +146,8 @@ CAMLprim value getsockopt_optint(int *sockopt, value socket,
   return res;
 }
 
-CAMLprim value setsockopt_optint(int *sockopt, value socket, int level,
-                                 value option, value status)
+CAMLexport value setsockopt_optint(int *sockopt, value socket, int level,
+                                   value option, value status)
 {
   struct linger optval;
 
@@ -170,8 +170,8 @@ CAMLprim value unix_setsockopt_optint(value socket, value option, value status)
   return setsockopt_optint(sockopt_optint, socket, SOL_SOCKET, option, status);
 }
 
-CAMLprim value getsockopt_float(int *sockopt, value socket,
-                                int level, value option)
+CAMLexport value getsockopt_float(int *sockopt, value socket,
+                                  int level, value option)
 {
   struct timeval tv;
   socklen_param_type optsize;
@@ -183,8 +183,8 @@ CAMLprim value getsockopt_float(int *sockopt, value socket,
   return copy_double((double) tv.tv_sec + (double) tv.tv_usec / 1e6);
 }
 
-CAMLprim value setsockopt_float(int *sockopt, value socket, int level,
-                                value option, value status)
+CAMLexport value setsockopt_float(int *sockopt, value socket, int level,
+                                  value option, value status)
 {
   struct timeval tv;
   double tv_f;

diff --git a/otherlibs/unix/time.c b/otherlibs/unix/time.c
index f56f2dd1cf32f8746a8a5bc2d9e1555908d3a266..50a4cf5c4bdc254528d19dcf73afb85959bbf5c9 100644 (file)
--- a/otherlibs/unix/time.c
+++ b/otherlibs/unix/time.c
@@ -11,14 +11,14 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: time.c,v 1.9 2001/12/07 13:40:36 xleroy Exp $ */
+/* $Id: time.c,v 1.9.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <time.h>
 #include <mlvalues.h>
 #include <alloc.h>
 #include "unixsupport.h"
 
-CAMLprim value unix_time(void)
+CAMLprim value unix_time(value unit)
 {
   return copy_double((double) time((time_t *) NULL));
 }

diff --git a/otherlibs/unix/times.c b/otherlibs/unix/times.c
index 865eb88a2cf8c046be6d4ac9eb019bdd041b32ee..4ae1a9eb8af8286c6cd640211482050cd8ebcca8 100644 (file)
--- a/otherlibs/unix/times.c
+++ b/otherlibs/unix/times.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: times.c,v 1.14 2001/12/07 13:40:36 xleroy Exp $ */
+/* $Id: times.c,v 1.14.6.1 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -29,7 +29,7 @@
 #endif
 #endif
 
-CAMLprim value unix_times(void)
+CAMLprim value unix_times(value unit)
 {
   value res;
   struct tms buffer;

diff --git a/otherlibs/unix/unix.mli b/otherlibs/unix/unix.mli
index 1ecb4b9f2377ffe5c542bc23f116fe13abf488df..8e7ff63f4a8e5fee8171c33b6e41911cda97e652 100644 (file)
--- a/otherlibs/unix/unix.mli
+++ b/otherlibs/unix/unix.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: unix.mli,v 1.79.2.3 2004/07/08 08:40:47 xleroy Exp $ *)
+(* $Id: unix.mli,v 1.79.2.4 2004/12/22 16:11:13 doligez Exp $ *)
 
 (** Interface to the Unix system *)
 
@@ -705,7 +705,7 @@ type process_times =
 (** The execution times (CPU times) of a process. *)
 
 type tm =
-  { tm_sec : int;               (** Seconds 0..59 *)
+  { tm_sec : int;               (** Seconds 0..60 *)
     tm_min : int;               (** Minutes 0..59 *)
     tm_hour : int;              (** Hours 0..23 *)
     tm_mday : int;              (** Day of month 1..31 *)

diff --git a/otherlibs/unix/wait.c b/otherlibs/unix/wait.c
index b4a3ab636b78a1d23ef946e7cf4a9d12b54ef209..9390c95ee8d0c2c698eadd2c04819ed270772adc 100644 (file)
--- a/otherlibs/unix/wait.c
+++ b/otherlibs/unix/wait.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: wait.c,v 1.17.6.2 2004/11/02 16:21:25 doligez Exp $ */
+/* $Id: wait.c,v 1.17.6.3 2005/01/17 18:10:36 doligez Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -61,7 +61,7 @@ static value alloc_process_status(int pid, int status)
   return res;
 }
 
-CAMLprim value unix_wait(void)
+CAMLprim value unix_wait(value unit)
 {
   int pid, status;
 

diff --git a/otherlibs/win32graph/CVS/Entries b/otherlibs/win32graph/CVS/Entries
new file mode 100644 (file)
index 0000000..af9ed85
--- /dev/null
+++ b/otherlibs/win32graph/CVS/Entries
@@ -0,0 +1,7 @@
+/Makefile.nt/1.5.6.1/Mon Jun 21 15:31:58 2004//Tocaml3083
+/dib.c/1.3/Tue Jul 23 14:12:00 2002//Tocaml3083
+/draw.c/1.9.2.3/Thu Feb  3 16:40:12 2005//Tocaml3083
+/events.c/1.1.2.1/Mon Jun 21 15:31:58 2004//Tocaml3083
+/libgraph.h/1.8.2.1/Mon Jun 21 15:31:58 2004//Tocaml3083
+/open.c/1.8.2.2/Mon Jun 21 15:44:17 2004//Tocaml3083
+D

diff --git a/otherlibs/win32graph/CVS/Repository b/otherlibs/win32graph/CVS/Repository
new file mode 100644 (file)
index 0000000..c7615d9
--- /dev/null
+++ b/otherlibs/win32graph/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/win32graph

diff --git a/otherlibs/win32graph/CVS/Root b/otherlibs/win32graph/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/win32graph/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/win32graph/CVS/Tag b/otherlibs/win32graph/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/win32graph/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/win32graph/draw.c b/otherlibs/win32graph/draw.c
index cf47fab34c871a933e496a26fc05b9b9254672cf..58024fb5fdf2d8d9478fa432b1ebeab841d4ab3a 100644 (file)
--- a/otherlibs/win32graph/draw.c
+++ b/otherlibs/win32graph/draw.c
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: draw.c,v 1.9.2.2 2004/06/21 15:44:56 xleroy Exp $ */
+/* $Id: draw.c,v 1.9.2.3 2005/02/03 16:40:12 xleroy Exp $ */
 
 #include <math.h>
 #include "mlvalues.h"
@@ -438,7 +438,7 @@ struct image {
 #define Height(i) (((struct image *)Data_custom_val(i))->h)
 #define Data(i) (((struct image *)Data_custom_val(i))->data)
 #define Mask(i) (((struct image *)Data_custom_val(i))->mask)
-#define Max_image_mem 53000000 
+#define Max_image_mem 500000 
 
 static void finalize_image (value i)
 {
@@ -466,6 +466,8 @@ CAMLprim value caml_gr_create_image(value vw, value vh)
                 gr_fail("create_image: width and height must be positive",0);
 
         cbm = CreateCompatibleBitmap(grwindow.gc, w, h);
+       if (cbm == NULL)
+               gr_fail("create_image: cannot create bitmap", 0);
         res = alloc_custom(&image_ops, sizeof(struct image),
                 w * h, Max_image_mem);
         if (res) {

diff --git a/otherlibs/win32unix/CVS/Entries b/otherlibs/win32unix/CVS/Entries
new file mode 100644 (file)
index 0000000..d3ca5b3
--- /dev/null
+++ b/otherlibs/win32unix/CVS/Entries
@@ -0,0 +1,44 @@
+/.cvsignore/1.2/Tue Apr  9 08:18:51 2002//Tocaml3083
+/.depend/1.5/Thu Sep 13 09:08:11 2001//Tocaml3083
+/Makefile.nt/1.32/Sun May 30 08:17:06 2004//Tocaml3083
+/accept.c/1.18.6.1/Wed Feb  2 15:40:14 2005//Tocaml3083
+/bind.c/1.10/Tue Apr 30 15:00:45 2002//Tocaml3083
+/channels.c/1.10/Mon Jan  6 14:52:57 2003//Tocaml3083
+/close.c/1.5/Tue Apr 30 15:00:46 2002//Tocaml3083
+/close_on.c/1.8/Fri Dec  7 13:40:43 2001//Tocaml3083
+/connect.c/1.11/Fri Jun  7 09:49:41 2002//Tocaml3083
+/createprocess.c/1.13/Fri Dec  7 13:40:43 2001//Tocaml3083
+/dup.c/1.6/Tue Apr 30 15:00:46 2002//Tocaml3083
+/dup2.c/1.7/Mon Jan  6 14:52:57 2003//Tocaml3083
+/errmsg.c/1.5/Wed Dec 31 00:00:14 2003//Tocaml3083
+/getpeername.c/1.9.6.1/Wed Feb  2 15:40:14 2005//Tocaml3083
+/getpid.c/1.4/Fri Dec  7 13:40:44 2001//Tocaml3083
+/getsockname.c/1.7.6.1/Wed Feb  2 15:40:14 2005//Tocaml3083
+/gettimeofday.c/1.6/Fri Dec  7 13:40:44 2001//Tocaml3083
+/link.c/1.3/Fri Dec  7 13:40:44 2001//Tocaml3083
+/listen.c/1.9/Tue Apr 30 15:00:46 2002//Tocaml3083
+/lockf.c/1.3/Tue Jul 23 14:12:01 2002//Tocaml3083
+/lseek.c/1.6/Fri Jun  7 09:49:41 2002//Tocaml3083
+/mkdir.c/1.5/Fri Dec  7 13:40:45 2001//Tocaml3083
+/nonblock.c/1.1/Mon Jan  6 16:44:21 2003//Tocaml3083
+/open.c/1.9/Fri Dec  7 13:40:45 2001//Tocaml3083
+/pipe.c/1.7/Fri Dec  7 13:40:45 2001//Tocaml3083
+/read.c/1.7/Tue Jul 23 14:12:01 2002//Tocaml3083
+/rename.c/1.2.8.1/Mon Jun 21 16:18:32 2004//Tocaml3083
+/select.c/1.10/Tue Jan  7 16:16:44 2003//Tocaml3083
+/sendrecv.c/1.16.6.1/Wed Feb  2 15:40:14 2005//Tocaml3083
+/shutdown.c/1.9/Tue Apr 30 15:00:47 2002//Tocaml3083
+/sleep.c/1.5/Fri Jun  7 09:49:41 2002//Tocaml3083
+/socket.c/1.12/Tue Apr 30 15:00:47 2002//Tocaml3083
+/socketaddr.h/1.7.2.1/Wed Feb  2 15:40:14 2005//Tocaml3083
+/sockopt.c/1.15/Tue Jul 23 14:12:01 2002//Tocaml3083
+/startup.c/1.9/Mon Jan  6 14:52:57 2003//Tocaml3083
+/stat.c/1.1/Wed Mar  6 16:55:20 2002//Tocaml3083
+/system.c/1.8/Fri Jun  7 09:49:41 2002//Tocaml3083
+/unix.ml/1.41.2.1/Tue Jun 22 17:18:50 2004//Tocaml3083
+/unixsupport.c/1.19/Thu Apr  1 13:12:36 2004//Tocaml3083
+/unixsupport.h/1.15/Mon Jan  6 14:52:57 2003//Tocaml3083
+/windir.c/1.13/Tue Jul 23 14:12:01 2002//Tocaml3083
+/winwait.c/1.14/Fri Jun  7 09:49:41 2002//Tocaml3083
+/write.c/1.7.6.2/Thu Jul  8 08:40:55 2004//Tocaml3083
+D

diff --git a/otherlibs/win32unix/CVS/Repository b/otherlibs/win32unix/CVS/Repository
new file mode 100644 (file)
index 0000000..5fc2f3d
--- /dev/null
+++ b/otherlibs/win32unix/CVS/Repository
@@ -0,0 +1 @@
+csl/otherlibs/win32unix

diff --git a/otherlibs/win32unix/CVS/Root b/otherlibs/win32unix/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/otherlibs/win32unix/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/otherlibs/win32unix/CVS/Tag b/otherlibs/win32unix/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/otherlibs/win32unix/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c
index 8cce0e77fd9d0f791df1b73cbdb374dac2e3855d..47a44125fcb37fdf9cac662329dc0f6e80985e0b 100644 (file)
--- a/otherlibs/win32unix/accept.c
+++ b/otherlibs/win32unix/accept.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: accept.c,v 1.18 2003/01/06 16:44:21 xleroy Exp $ */
+/* $Id: accept.c,v 1.18.6.1 2005/02/02 15:40:14 xleroy Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -57,7 +57,7 @@ CAMLprim value unix_accept(sock)
   }
   Begin_roots2 (fd, adr)
     fd = win_alloc_socket(snew);
-    adr = alloc_sockaddr(&addr, addr_len);
+    adr = alloc_sockaddr(&addr, addr_len, snew);
     res = alloc_small(2, 0);
     Field(res, 0) = fd;
     Field(res, 1) = adr;

diff --git a/otherlibs/win32unix/getpeername.c b/otherlibs/win32unix/getpeername.c
index 38d0d88f18451bc8ae3b588555854bb69ad64e4b..6a5189ee8be2e1e3402d6af4aef6a8356730d2fd 100644 (file)
--- a/otherlibs/win32unix/getpeername.c
+++ b/otherlibs/win32unix/getpeername.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getpeername.c,v 1.9 2002/04/30 15:00:46 xleroy Exp $ */
+/* $Id: getpeername.c,v 1.9.6.1 2005/02/02 15:40:14 xleroy Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
@@ -31,5 +31,5 @@ CAMLprim value unix_getpeername(sock)
     win32_maperr(WSAGetLastError());
     uerror("getpeername", Nothing);
   }
-  return alloc_sockaddr(&addr, addr_len);
+  return alloc_sockaddr(&addr, addr_len, -1);
 }

diff --git a/otherlibs/win32unix/getsockname.c b/otherlibs/win32unix/getsockname.c
index ceda5c2a31d88283eb4abca621cef7857803e61c..559e3ba3a5afd24d35b47741b9592ee37594ed03 100644 (file)
--- a/otherlibs/win32unix/getsockname.c
+++ b/otherlibs/win32unix/getsockname.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: getsockname.c,v 1.7 2002/04/30 15:00:46 xleroy Exp $ */
+/* $Id: getsockname.c,v 1.7.6.1 2005/02/02 15:40:14 xleroy Exp $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
@@ -28,5 +28,5 @@ CAMLprim value unix_getsockname(sock)
   retcode = getsockname(Socket_val(sock),
                         &addr.s_gen, &addr_len);
   if (retcode == -1) uerror("getsockname", Nothing);
-  return alloc_sockaddr(&addr, addr_len);
+  return alloc_sockaddr(&addr, addr_len, -1);
 }

diff --git a/otherlibs/win32unix/sendrecv.c b/otherlibs/win32unix/sendrecv.c
index a0ede1d186f42abd9933cd2e251ce5dbcdb7e043..9203cb92a6a2e3faa58bbd75fb8ea17e9d3b17ef 100644 (file)
--- a/otherlibs/win32unix/sendrecv.c
+++ b/otherlibs/win32unix/sendrecv.c
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: sendrecv.c,v 1.16 2002/06/07 09:49:41 xleroy Exp $ */
+/* $Id: sendrecv.c,v 1.16.6.1 2005/02/02 15:40:14 xleroy Exp $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -71,7 +71,7 @@ CAMLprim value unix_recvfrom(value sock, value buff, value ofs, value len, value
       uerror("recvfrom", Nothing);
     }
     memmove (&Byte(buff, Long_val(ofs)), iobuf, ret);
-    adr = alloc_sockaddr(&addr, addr_len);
+    adr = alloc_sockaddr(&addr, addr_len, -1);
     res = alloc_small(2, 0);
     Field(res, 0) = Val_int(ret);
     Field(res, 1) = adr;

diff --git a/otherlibs/win32unix/socketaddr.h b/otherlibs/win32unix/socketaddr.h
index 8e0d25482699844dbb6e2d5c583b8b67682d4d7c..1736150726bdc140071d87917026d35e3ea21639 100644 (file)
--- a/otherlibs/win32unix/socketaddr.h
+++ b/otherlibs/win32unix/socketaddr.h
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: socketaddr.h,v 1.7 2004/04/27 13:49:50 xleroy Exp $ */
+/* $Id: socketaddr.h,v 1.7.2.1 2005/02/02 15:40:14 xleroy Exp $ */
 
 #include <misc.h>
 
@@ -32,6 +32,6 @@ extern void get_sockaddr (value mladdr,
                           union sock_addr_union * addr /*out*/,
                           socklen_param_type * addr_len /*out*/);
 CAMLprim value alloc_sockaddr (union sock_addr_union * addr /*in*/,
-                      socklen_param_type addr_len);
+                      socklen_param_type addr_len, int close_on_error);
 CAMLprim value alloc_inet_addr (struct in_addr * inaddr);
 #define GET_INET_ADDR(v) (*((struct in_addr *) (v)))

diff --git a/parsing/CVS/Entries b/parsing/CVS/Entries
new file mode 100644 (file)
index 0000000..669bba1
--- /dev/null
+++ b/parsing/CVS/Entries
@@ -0,0 +1,19 @@
+/.cvsignore/1.4/Fri Jun 23 15:08:43 2000//Tocaml3083
+/asttypes.mli/1.9/Fri Apr 25 12:27:30 2003//Tocaml3083
+/lexer.mli/1.14/Fri Nov 21 16:01:13 2003//Tocaml3083
+/lexer.mll/1.69/Fri Jan 16 15:24:02 2004//Tocaml3083
+/linenum.mli/1.2/Wed Nov 17 18:58:17 1999//Tocaml3083
+/linenum.mll/1.7/Wed Nov 17 18:58:17 1999//Tocaml3083
+/location.ml/1.44.6.1/Wed Jan 12 17:01:58 2005//Tocaml3083
+/location.mli/1.15.10.1/Wed Jan 12 17:01:58 2005//Tocaml3083
+/longident.ml/1.4/Sat Mar 25 18:55:44 2000//Tocaml3083
+/longident.mli/1.7/Sat Mar 25 18:55:44 2000//Tocaml3083
+/parse.ml/1.15/Fri Nov  1 17:06:46 2002//Tocaml3083
+/parse.mli/1.6/Wed Nov 17 18:58:19 1999//Tocaml3083
+/parser.mly/1.120/Wed May 19 12:15:19 2004//Tocaml3083
+/parsetree.mli/1.40/Tue Nov 25 08:46:45 2003//Tocaml3083
+/printast.ml/1.26/Tue Nov 25 08:46:45 2003//Tocaml3083
+/printast.mli/1.2/Mon Mar  6 22:11:39 2000//Tocaml3083
+/syntaxerr.ml/1.8/Thu Apr 18 08:50:43 2002//Tocaml3083
+/syntaxerr.mli/1.4/Mon Mar  6 22:11:40 2000//Tocaml3083
+D

diff --git a/parsing/CVS/Repository b/parsing/CVS/Repository
new file mode 100644 (file)
index 0000000..39db657
--- /dev/null
+++ b/parsing/CVS/Repository
@@ -0,0 +1 @@
+csl/parsing

diff --git a/parsing/CVS/Root b/parsing/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/parsing/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/parsing/CVS/Tag b/parsing/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/parsing/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/parsing/location.ml b/parsing/location.ml
index a208d24c52bb414033b69d5f52bb12a201d40e29..5485054843dc7486c2c54a3fb2bd17af03f8f229 100644 (file)
--- a/parsing/location.ml
+++ b/parsing/location.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: location.ml,v 1.44 2004/01/16 15:24:02 doligez Exp $ *)
+(* $Id: location.ml,v 1.44.6.1 2005/01/12 17:01:58 doligez Exp $ *)
 
 open Lexing
 
@@ -18,6 +18,16 @@ type t = { loc_start: position; loc_end: position; loc_ghost: bool };;
 
 let none = { loc_start = dummy_pos; loc_end = dummy_pos; loc_ghost = true };;
 
+let in_file name =
+  let loc = {
+    pos_fname = name;
+    pos_lnum = 1;
+    pos_bol = 0;
+    pos_cnum = -1;
+  } in
+  { loc_start = loc; loc_end = loc; loc_ghost = true }
+;;
+
 let curr lexbuf = {
   loc_start = lexbuf.lex_start_p;
   loc_end = lexbuf.lex_curr_p;
@@ -207,6 +217,9 @@ let get_pos_info pos =
 let print ppf loc =
   let (file, line, startchar) = get_pos_info loc.loc_start in
   let endchar = loc.loc_end.pos_cnum - loc.loc_start.pos_cnum + startchar in
+  let (startchar, endchar) =
+    if startchar < 0 then (0, 1) else (startchar, endchar)
+  in
   if file = "" then begin
     if highlight_locations ppf loc none then () else
       fprintf ppf "Characters %i-%i:@."

diff --git a/parsing/location.mli b/parsing/location.mli
index bfb62262be9f27acdf60fe19e2d874d5d4a2f2ec..07a3fa68f4b5ec796b3f694cdb4d69353f8af877 100644 (file)
--- a/parsing/location.mli
+++ b/parsing/location.mli
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: location.mli,v 1.15 2002/12/12 10:48:49 doligez Exp $ *)
+(* $Id: location.mli,v 1.15.10.1 2005/01/12 17:01:58 doligez Exp $ *)
 
 (* Source code locations (ranges of positions), used in parsetree. *)
 
@@ -31,6 +31,8 @@ type t = {
 
 val none : t
 (** An arbitrary value of type [t]; describes an empty ghost range. *)
+val in_file : string -> t;;
+(** Return an empty ghost range located in a given file. *)
 val init : Lexing.lexbuf -> string -> unit
 (** Set the file name and line number of the [lexbuf] to be the start
     of the named file. *)

diff --git a/stdlib/.depend b/stdlib/.depend
index 82a3ead4996240d6133e42af3027d8ffa3c1a50d..1104779cf0bc88de504d1db983fc80c6a4f164e1 100644 (file)
--- a/stdlib/.depend
+++ b/stdlib/.depend
@@ -1,52 +1,52 @@
 camlinternalOO.cmi: obj.cmi 
 format.cmi: buffer.cmi 
 genlex.cmi: stream.cmi 
-moreLabels.cmi: hashtbl.cmi map.cmi set.cmi 
+moreLabels.cmi: set.cmi map.cmi hashtbl.cmi 
 oo.cmi: camlinternalOO.cmi 
-parsing.cmi: lexing.cmi obj.cmi 
+parsing.cmi: obj.cmi lexing.cmi 
 printf.cmi: buffer.cmi 
-random.cmi: int32.cmi int64.cmi nativeint.cmi 
+random.cmi: nativeint.cmi int64.cmi int32.cmi 
 weak.cmi: hashtbl.cmi 
-arg.cmo: array.cmi buffer.cmi list.cmi printf.cmi string.cmi sys.cmi arg.cmi 
-arg.cmx: array.cmx buffer.cmx list.cmx printf.cmx string.cmx sys.cmx arg.cmi 
+arg.cmo: sys.cmi string.cmi printf.cmi list.cmi buffer.cmi array.cmi arg.cmi 
+arg.cmx: sys.cmx string.cmx printf.cmx list.cmx buffer.cmx array.cmx arg.cmi 
 array.cmo: array.cmi 
 array.cmx: array.cmi 
 arrayLabels.cmo: array.cmi arrayLabels.cmi 
 arrayLabels.cmx: array.cmx arrayLabels.cmi 
-buffer.cmo: string.cmi sys.cmi buffer.cmi 
-buffer.cmx: string.cmx sys.cmx buffer.cmi 
+buffer.cmo: sys.cmi string.cmi buffer.cmi 
+buffer.cmx: sys.cmx string.cmx buffer.cmi 
 callback.cmo: obj.cmi callback.cmi 
 callback.cmx: obj.cmx callback.cmi 
-camlinternalOO.cmo: array.cmi char.cmi list.cmi map.cmi obj.cmi string.cmi \
-    sys.cmi camlinternalOO.cmi 
-camlinternalOO.cmx: array.cmx char.cmx list.cmx map.cmx obj.cmx string.cmx \
-    sys.cmx camlinternalOO.cmi 
+camlinternalOO.cmo: sys.cmi string.cmi obj.cmi map.cmi list.cmi char.cmi \
+    array.cmi camlinternalOO.cmi 
+camlinternalOO.cmx: sys.cmx string.cmx obj.cmx map.cmx list.cmx char.cmx \
+    array.cmx camlinternalOO.cmi 
 char.cmo: char.cmi 
 char.cmx: char.cmi 
 complex.cmo: complex.cmi 
 complex.cmx: complex.cmi 
-digest.cmo: printf.cmi string.cmi digest.cmi 
-digest.cmx: printf.cmx string.cmx digest.cmi 
-filename.cmo: buffer.cmi printf.cmi random.cmi string.cmi sys.cmi \
+digest.cmo: string.cmi printf.cmi digest.cmi 
+digest.cmx: string.cmx printf.cmx digest.cmi 
+filename.cmo: sys.cmi string.cmi random.cmi printf.cmi buffer.cmi \
     filename.cmi 
-filename.cmx: buffer.cmx printf.cmx random.cmx string.cmx sys.cmx \
+filename.cmx: sys.cmx string.cmx random.cmx printf.cmx buffer.cmx \
     filename.cmi 
-format.cmo: buffer.cmi list.cmi obj.cmi printf.cmi string.cmi format.cmi 
-format.cmx: buffer.cmx list.cmx obj.cmx printf.cmx string.cmx format.cmi 
-gc.cmo: printf.cmi sys.cmi gc.cmi 
-gc.cmx: printf.cmx sys.cmx gc.cmi 
-genlex.cmo: char.cmi hashtbl.cmi list.cmi stream.cmi string.cmi genlex.cmi 
-genlex.cmx: char.cmx hashtbl.cmx list.cmx stream.cmx string.cmx genlex.cmi 
-hashtbl.cmo: array.cmi sys.cmi hashtbl.cmi 
-hashtbl.cmx: array.cmx sys.cmx hashtbl.cmi 
+format.cmo: string.cmi printf.cmi obj.cmi list.cmi buffer.cmi format.cmi 
+format.cmx: string.cmx printf.cmx obj.cmx list.cmx buffer.cmx format.cmi 
+gc.cmo: sys.cmi printf.cmi gc.cmi 
+gc.cmx: sys.cmx printf.cmx gc.cmi 
+genlex.cmo: string.cmi stream.cmi list.cmi hashtbl.cmi char.cmi genlex.cmi 
+genlex.cmx: string.cmx stream.cmx list.cmx hashtbl.cmx char.cmx genlex.cmi 
+hashtbl.cmo: sys.cmi array.cmi hashtbl.cmi 
+hashtbl.cmx: sys.cmx array.cmx hashtbl.cmi 
 int32.cmo: pervasives.cmi int32.cmi 
 int32.cmx: pervasives.cmx int32.cmi 
 int64.cmo: pervasives.cmi int64.cmi 
 int64.cmx: pervasives.cmx int64.cmi 
 lazy.cmo: obj.cmi lazy.cmi 
 lazy.cmx: obj.cmx lazy.cmi 
-lexing.cmo: array.cmi string.cmi sys.cmi lexing.cmi 
-lexing.cmx: array.cmx string.cmx sys.cmx lexing.cmi 
+lexing.cmo: sys.cmi string.cmi array.cmi lexing.cmi 
+lexing.cmx: sys.cmx string.cmx array.cmx lexing.cmi 
 list.cmo: list.cmi 
 list.cmx: list.cmi 
 listLabels.cmo: list.cmi listLabels.cmi 
@@ -55,31 +55,31 @@ map.cmo: map.cmi
 map.cmx: map.cmi 
 marshal.cmo: string.cmi marshal.cmi 
 marshal.cmx: string.cmx marshal.cmi 
-moreLabels.cmo: hashtbl.cmi map.cmi set.cmi moreLabels.cmi 
-moreLabels.cmx: hashtbl.cmx map.cmx set.cmx moreLabels.cmi 
-nativeint.cmo: pervasives.cmi sys.cmi nativeint.cmi 
-nativeint.cmx: pervasives.cmx sys.cmx nativeint.cmi 
+moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi 
+moreLabels.cmx: set.cmx map.cmx hashtbl.cmx moreLabels.cmi 
+nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi 
+nativeint.cmx: sys.cmx pervasives.cmx nativeint.cmi 
 obj.cmo: marshal.cmi obj.cmi 
 obj.cmx: marshal.cmx obj.cmi 
 oo.cmo: camlinternalOO.cmi oo.cmi 
 oo.cmx: camlinternalOO.cmx oo.cmi 
-parsing.cmo: array.cmi lexing.cmi obj.cmi parsing.cmi 
-parsing.cmx: array.cmx lexing.cmx obj.cmx parsing.cmi 
+parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi 
+parsing.cmx: obj.cmx lexing.cmx array.cmx parsing.cmi 
 pervasives.cmo: pervasives.cmi 
 pervasives.cmx: pervasives.cmi 
-printexc.cmo: obj.cmi printf.cmi printexc.cmi 
-printexc.cmx: obj.cmx printf.cmx printexc.cmi 
-printf.cmo: buffer.cmi char.cmi list.cmi obj.cmi string.cmi printf.cmi 
-printf.cmx: buffer.cmx char.cmx list.cmx obj.cmx string.cmx printf.cmi 
+printexc.cmo: printf.cmi obj.cmi printexc.cmi 
+printexc.cmx: printf.cmx obj.cmx printexc.cmi 
+printf.cmo: string.cmi obj.cmi list.cmi char.cmi buffer.cmi printf.cmi 
+printf.cmx: string.cmx obj.cmx list.cmx char.cmx buffer.cmx printf.cmi 
 queue.cmo: obj.cmi queue.cmi 
 queue.cmx: obj.cmx queue.cmi 
-random.cmo: array.cmi char.cmi digest.cmi int32.cmi int64.cmi nativeint.cmi \
-    pervasives.cmi string.cmi random.cmi 
-random.cmx: array.cmx char.cmx digest.cmx int32.cmx int64.cmx nativeint.cmx \
-    pervasives.cmx string.cmx random.cmi 
-scanf.cmo: buffer.cmi hashtbl.cmi list.cmi obj.cmi printf.cmi string.cmi \
+random.cmo: string.cmi pervasives.cmi nativeint.cmi int64.cmi int32.cmi \
+    digest.cmi char.cmi array.cmi random.cmi 
+random.cmx: string.cmx pervasives.cmx nativeint.cmx int64.cmx int32.cmx \
+    digest.cmx char.cmx array.cmx random.cmi 
+scanf.cmo: string.cmi printf.cmi obj.cmi list.cmi hashtbl.cmi buffer.cmi \
     scanf.cmi 
-scanf.cmx: buffer.cmx hashtbl.cmx list.cmx obj.cmx printf.cmx string.cmx \
+scanf.cmx: string.cmx printf.cmx obj.cmx list.cmx hashtbl.cmx buffer.cmx \
     scanf.cmi 
 set.cmo: set.cmi 
 set.cmx: set.cmi 
@@ -87,15 +87,15 @@ sort.cmo: array.cmi sort.cmi
 sort.cmx: array.cmx sort.cmi 
 stack.cmo: list.cmi stack.cmi 
 stack.cmx: list.cmx stack.cmi 
-stdLabels.cmo: arrayLabels.cmi listLabels.cmi stringLabels.cmi stdLabels.cmi 
-stdLabels.cmx: arrayLabels.cmx listLabels.cmx stringLabels.cmx stdLabels.cmi 
-stream.cmo: list.cmi obj.cmi string.cmi stream.cmi 
-stream.cmx: list.cmx obj.cmx string.cmx stream.cmi 
-string.cmo: char.cmi list.cmi pervasives.cmi string.cmi 
-string.cmx: char.cmx list.cmx pervasives.cmx string.cmi 
+stdLabels.cmo: stringLabels.cmi listLabels.cmi arrayLabels.cmi stdLabels.cmi 
+stdLabels.cmx: stringLabels.cmx listLabels.cmx arrayLabels.cmx stdLabels.cmi 
+stream.cmo: string.cmi obj.cmi list.cmi stream.cmi 
+stream.cmx: string.cmx obj.cmx list.cmx stream.cmi 
+string.cmo: pervasives.cmi list.cmi char.cmi string.cmi 
+string.cmx: pervasives.cmx list.cmx char.cmx string.cmi 
 stringLabels.cmo: string.cmi stringLabels.cmi 
 stringLabels.cmx: string.cmx stringLabels.cmi 
 sys.cmo: sys.cmi 
 sys.cmx: sys.cmi 
-weak.cmo: array.cmi hashtbl.cmi obj.cmi sys.cmi weak.cmi 
-weak.cmx: array.cmx hashtbl.cmx obj.cmx sys.cmx weak.cmi 
+weak.cmo: sys.cmi obj.cmi hashtbl.cmi array.cmi weak.cmi 
+weak.cmx: sys.cmx obj.cmx hashtbl.cmx array.cmx weak.cmi 

diff --git a/stdlib/CVS/Entries b/stdlib/CVS/Entries
new file mode 100644 (file)
index 0000000..da6b8f8
--- /dev/null
+++ b/stdlib/CVS/Entries
@@ -0,0 +1,95 @@
+/.cvsignore/1.9/Wed Nov 19 14:01:23 2003//Tocaml3083
+/.depend/1.56.6.2/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Compflags/1.1.4.1/Thu Jul  8 07:43:13 2004//Tocaml3083
+/Makefile/1.81/Mon Jun 14 12:23:21 2004//Tocaml3083
+/Makefile.nt/1.35.2.1/Wed Feb  2 15:41:59 2005//Tocaml3083
+/StdlibModules/1.2/Wed Nov 26 10:57:14 2003//Tocaml3083
+/arg.ml/1.33.2.1/Fri Jul  2 09:01:16 2004//Tocaml3083
+/arg.mli/1.35/Fri Jun 11 23:45:46 2004//Tocaml3083
+/array.ml/1.23/Wed Dec 31 14:20:39 2003//Tocaml3083
+/array.mli/1.38/Wed Dec 31 14:20:39 2003//Tocaml3083
+/arrayLabels.ml/1.3/Fri Dec  7 13:40:49 2001//Tocaml3083
+/arrayLabels.mli/1.10/Wed Dec 31 14:20:39 2003//Tocaml3083
+/buffer.ml/1.17/Mon Jun 14 20:20:16 2004//Tocaml3083
+/buffer.mli/1.20/Sat Apr 17 13:36:03 2004//Tocaml3083
+/callback.ml/1.5/Wed Dec 31 14:20:39 2003//Tocaml3083
+/callback.mli/1.5/Fri Dec  7 13:40:50 2001//Tocaml3083
+/camlinternalOO.ml/1.9/Wed May 26 11:10:51 2004//Tocaml3083
+/camlinternalOO.mli/1.6/Wed May 26 11:10:51 2004//Tocaml3083
+/char.ml/1.12/Tue Dec 16 18:09:43 2003//Tocaml3083
+/char.mli/1.16/Wed Jun 26 09:13:58 2002//Tocaml3083
+/complex.ml/1.5/Thu Apr 18 07:27:42 2002//Tocaml3083
+/complex.mli/1.3/Thu Apr 18 07:27:42 2002//Tocaml3083
+/digest.ml/1.10/Wed Dec 31 14:20:39 2003//Tocaml3083
+/digest.mli/1.16/Wed Dec 31 14:20:39 2003//Tocaml3083
+/filename.ml/1.34.2.1/Mon Jan 31 17:01:02 2005//Tocaml3083
+/filename.mli/1.31.2.1/Mon Jan 31 17:01:02 2005//Tocaml3083
+/format.ml/1.55.4.2/Mon Jul 12 23:03:16 2004//Tocaml3083
+/format.mli/1.66.2.2/Mon Jul 12 23:03:16 2004//Tocaml3083
+/gc.ml/1.20/Mon Jun 14 13:27:36 2004//Tocaml3083
+/gc.mli/1.40/Mon Jun 14 13:27:36 2004//Tocaml3083
+/genlex.ml/1.9/Thu Apr 18 07:27:42 2002//Tocaml3083
+/genlex.mli/1.8/Fri Dec  7 13:40:51 2001//Tocaml3083
+/hashtbl.ml/1.26/Tue Mar 23 12:37:19 2004//Tocaml3083
+/hashtbl.mli/1.35.4.2/Thu Nov 25 13:30:34 2004//Tocaml3083
+/header.c/1.17/Fri Dec  7 13:40:52 2001//Tocaml3083
+/headernt.c/1.19/Tue Jul 23 14:12:01 2002//Tocaml3083
+/int32.ml/1.9/Thu Jan  1 16:42:40 2004//Tocaml3083
+/int32.mli/1.16/Thu Jan  1 16:42:40 2004//Tocaml3083
+/int64.ml/1.11/Thu Jan  1 16:42:40 2004//Tocaml3083
+/int64.mli/1.17/Thu Jan  1 16:42:40 2004//Tocaml3083
+/lazy.ml/1.11/Thu Jan  1 16:42:40 2004//Tocaml3083
+/lazy.mli/1.10/Tue Jul 30 13:02:56 2002//Tocaml3083
+/lexing.ml/1.23/Wed Dec 31 14:20:39 2003//Tocaml3083
+/lexing.mli/1.30/Wed Aug 13 15:31:36 2003//Tocaml3083
+/list.ml/1.31/Thu Jan  1 16:42:40 2004//Tocaml3083
+/list.mli/1.44/Fri Nov 21 16:06:08 2003//Tocaml3083
+/listLabels.ml/1.3/Fri Dec  7 13:40:54 2001//Tocaml3083
+/listLabels.mli/1.10/Fri Jul 25 21:40:06 2003//Tocaml3083
+/map.ml/1.15/Fri Apr 23 10:01:33 2004//Tocaml3083
+/map.mli/1.32/Fri Apr 23 10:01:33 2004//Tocaml3083
+/marshal.ml/1.8/Thu Jan  1 16:42:40 2004//Tocaml3083
+/marshal.mli/1.13/Thu Jan  1 16:42:40 2004//Tocaml3083
+/moreLabels.ml/1.2/Fri Dec  7 13:40:55 2001//Tocaml3083
+/moreLabels.mli/1.12/Fri Apr 23 10:01:34 2004//Tocaml3083
+/nativeint.ml/1.10/Thu Jan  1 16:42:40 2004//Tocaml3083
+/nativeint.mli/1.17/Thu Jan  1 16:42:40 2004//Tocaml3083
+/obj.ml/1.23/Thu Jan  1 16:42:40 2004//Tocaml3083
+/obj.mli/1.27/Thu Jan  1 16:42:40 2004//Tocaml3083
+/oo.ml/1.27/Wed May 26 11:10:52 2004//Tocaml3083
+/oo.mli/1.28/Wed May 26 11:10:52 2004//Tocaml3083
+/parsing.ml/1.18/Thu Jan  1 16:42:40 2004//Tocaml3083
+/parsing.mli/1.18/Wed Apr 14 15:37:30 2004//Tocaml3083
+/pervasives.ml/1.75.6.1/Tue Jun 22 12:13:46 2004//Tocaml3083
+/pervasives.mli/1.99.2.3/Mon Jan 31 12:47:53 2005//Tocaml3083
+/printexc.ml/1.18/Fri Jan 16 15:24:02 2004//Tocaml3083
+/printexc.mli/1.11/Fri Dec  7 13:40:57 2001//Tocaml3083
+/printf.ml/1.30/Fri Jan  2 19:23:29 2004//Tocaml3083
+/printf.mli/1.37/Sat Jul  5 11:13:23 2003//Tocaml3083
+/queue.ml/1.9/Tue Jul 23 14:12:01 2002//Tocaml3083
+/queue.mli/1.16/Thu Jun 27 08:48:26 2002//Tocaml3083
+/random.ml/1.22/Tue Dec 16 18:09:43 2003//Tocaml3083
+/random.mli/1.16/Tue Jun 24 09:50:23 2003//Tocaml3083
+/scanf.ml/1.49.2.2/Fri Jul  2 22:24:24 2004//Tocaml3083
+/scanf.mli/1.45.6.3/Thu Nov 25 13:30:34 2004//Tocaml3083
+/set.ml/1.18.4.1/Wed Nov  3 21:19:49 2004//Tocaml3083
+/set.mli/1.32/Fri Apr 23 10:01:54 2004//Tocaml3083
+/sharpbang/1.2/Mon Apr 27 15:14:31 1998//Tocaml3083
+/sort.ml/1.9/Wed Jan 14 17:20:56 2004//Tocaml3083
+/sort.mli/1.13/Fri Dec  7 13:40:58 2001//Tocaml3083
+/stack.ml/1.9/Thu Jun 27 08:48:26 2002//Tocaml3083
+/stack.mli/1.18/Thu Jun 27 08:48:26 2002//Tocaml3083
+/stdLabels.ml/1.3/Fri Dec  7 13:40:59 2001//Tocaml3083
+/stdLabels.mli/1.11.2.1/Tue Jun 22 14:23:24 2004//Tocaml3083
+/std_exit.ml/1.5/Fri Dec  7 13:40:59 2001//Tocaml3083
+/stream.ml/1.13/Fri Dec  7 13:40:59 2001//Tocaml3083
+/stream.mli/1.24/Fri Dec 28 23:12:48 2001//Tocaml3083
+/string.ml/1.25/Tue Dec 16 18:09:43 2003//Tocaml3083
+/string.mli/1.36.6.1/Wed Nov  3 21:17:18 2004//Tocaml3083
+/stringLabels.ml/1.4/Sat Jan  3 22:08:38 2004//Tocaml3083
+/stringLabels.mli/1.8.6.1/Tue Jun 22 14:23:25 2004//Tocaml3083
+/sys.ml/1.101.2.22/Wed Mar 16 12:05:33 2005//Tocaml3083
+/sys.mli/1.45/Tue May  4 11:51:13 2004//Tocaml3083
+/weak.ml/1.13/Thu Jan  1 16:42:41 2004//Tocaml3083
+/weak.mli/1.15/Mon Feb  2 14:43:12 2004//Tocaml3083
+D

diff --git a/stdlib/CVS/Repository b/stdlib/CVS/Repository
new file mode 100644 (file)
index 0000000..79ddc36
--- /dev/null
+++ b/stdlib/CVS/Repository
@@ -0,0 +1 @@
+csl/stdlib

diff --git a/stdlib/CVS/Root b/stdlib/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/stdlib/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/stdlib/CVS/Tag b/stdlib/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/stdlib/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/stdlib/Makefile.nt b/stdlib/Makefile.nt
index 8e4e80a9583fe7eed99dfd0a6920299611422b42..912b781da19a21c298118fbfbd05336ed18d91b5 100644 (file)
--- a/stdlib/Makefile.nt
+++ b/stdlib/Makefile.nt
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile.nt,v 1.35 2004/06/14 12:23:40 xleroy Exp $
+# $Id: Makefile.nt,v 1.35.2.1 2005/02/02 15:41:59 xleroy Exp $
 
 include ../config/Makefile
 
@@ -54,8 +54,9 @@ stdlib.cmxa: $(OBJS:.cmo=.cmx)
        $(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx)
 
 camlheader camlheader_ur: headernt.c ../config/Makefile
-       $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o camlheader.exe headernt.c
-       mv camlheader.exe camlheader.
+       $(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o tmpheader.exe headernt.c
+       rm -f camlheader.exe
+       mv tmpheader.exe camlheader
        cp camlheader camlheader_ur
 
 clean::

diff --git a/stdlib/filename.ml b/stdlib/filename.ml
index 09b9dd1986569e16207aede19284c231067d8867..e7cd9aad23f74d387891514d4837f395c1e447a7 100644 (file)
--- a/stdlib/filename.ml
+++ b/stdlib/filename.ml
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: filename.ml,v 1.34 2004/05/30 09:41:53 xleroy Exp $ *)
+(* $Id: filename.ml,v 1.34.2.1 2005/01/31 17:01:02 doligez Exp $ *)
 
 let generic_quote quotequote s =
   let l = String.length s in
@@ -129,11 +129,14 @@ let concat dirname filename =
   else dirname ^ dir_sep ^ filename
 
 let basename name =
-  try
-    let p = rindex_dir_sep name + 1 in
-    String.sub name p (String.length name - p)
-  with Not_found ->
-    name
+  let raw_name =
+    try
+      let p = rindex_dir_sep name + 1 in
+      String.sub name p (String.length name - p)
+    with Not_found ->
+      name
+  in
+  if raw_name = "" then current_dir_name else raw_name
 
 let dirname name =
   try

diff --git a/stdlib/filename.mli b/stdlib/filename.mli
index d1c831b47e7b18c354532f9aa55eda05357652d7..e092a31961d348c5d3c77ceba032f55ef952b936 100644 (file)
--- a/stdlib/filename.mli
+++ b/stdlib/filename.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: filename.mli,v 1.31 2004/05/30 09:41:53 xleroy Exp $ *)
+(* $Id: filename.mli,v 1.31.2.1 2005/01/31 17:01:02 doligez Exp $ *)
 
 (** Operations on file names. *)
 
@@ -60,7 +60,10 @@ val basename : string -> string
    which is equivalent to [name]. Moreover, after setting the
    current directory to [dirname name] (with {!Sys.chdir}),
    references to [basename name] (which is a relative file name)
-   designate the same file as [name] before the call to {!Sys.chdir}. *)
+   designate the same file as [name] before the call to {!Sys.chdir}.
+
+   The result is not specified if the argument is not a valid file name
+   (for example, under Unix if there is a NUL character in the string). *)
 
 val dirname : string -> string
 (** See {!Filename.basename}. *)

diff --git a/stdlib/hashtbl.mli b/stdlib/hashtbl.mli
index ab9d344bcb6fbdd095f31f2f6cc1d6357bc7be74..1611292c3d2043ae122e4984bfbb364c5b236c60 100644 (file)
--- a/stdlib/hashtbl.mli
+++ b/stdlib/hashtbl.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: hashtbl.mli,v 1.35.4.1 2004/08/10 15:30:29 doligez Exp $ *)
+(* $Id: hashtbl.mli,v 1.35.4.2 2004/11/25 13:30:34 doligez Exp $ *)
 
 (** Hash tables and hash functions.
 
@@ -118,7 +118,7 @@ module type HashedType =
           for comparing objects by structure and handling {!Pervasives.nan}
           correctly, and
           ([(==)], {!Hashtbl.hash}) for comparing objects by addresses
-          (e.g. for or cyclic keys). *)
+          (e.g. for cyclic keys). *)
    end
 (** The input signature of the functor {!Hashtbl.Make}. *)
 

diff --git a/stdlib/pervasives.mli b/stdlib/pervasives.mli
index 0b19d044e211da3490c9f3ff3f6424ec7ed42362..87d3e5a15b4b644eefc944a725fc2cf87cf6b2d5 100644 (file)
--- a/stdlib/pervasives.mli
+++ b/stdlib/pervasives.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: pervasives.mli,v 1.99.2.2 2004/06/22 14:33:37 xleroy Exp $ *)
+(* $Id: pervasives.mli,v 1.99.2.3 2005/01/31 12:47:53 doligez Exp $ *)
 
 (** The initially opened module.
 
@@ -550,7 +550,7 @@ type open_flag =
   | Open_append      (** open for appending: always write at end of file. *)
   | Open_creat       (** create the file if it does not exist. *)
   | Open_trunc       (** empty the file if it already exists. *)
-  | Open_excl        (** fail if the file already exists. *)
+  | Open_excl        (** fail if Open_creat and the file already exists. *)
   | Open_binary      (** open in binary mode (no conversion). *)
   | Open_text        (** open in text mode (may perform conversions). *)
   | Open_nonblock    (** open in non-blocking mode. *)

diff --git a/stdlib/scanf.mli b/stdlib/scanf.mli
index 14c8d18d31b2fe9d24105bf45f13d9691e0d7be9..b42d833f1123cfd0fd1a9263919a25d34b89cbe0 100644 (file)
--- a/stdlib/scanf.mli
+++ b/stdlib/scanf.mli
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: scanf.mli,v 1.45.6.2 2004/09/09 07:44:30 weis Exp $ *)
+(* $Id: scanf.mli,v 1.45.6.3 2004/11/25 13:30:34 doligez Exp $ *)
 
 (** Formatted input functions. *)
 
@@ -142,7 +142,7 @@ val bscanf :
      it, if the range starts with [^]). Returns a [string] that can be
      empty, if no character in the input matches the range. Hence,
      [\[0-9\]] returns a string representing a decimal number or an empty
-     string if no decimal digit is found. 
+     string if no decimal digit is found.
      If a closing bracket appears in a range, it must occur as the
      first character of the range (or just after the [^] in case of
      range negation); hence [\[\]\]] matches a [\]] character and

diff --git a/stdlib/sys.ml b/stdlib/sys.ml
index fe83dc4870dca16a74de8a04cc07b051c82b5590..ad8d5800008cd23822c658d764c374095db7b364 100644 (file)
--- a/stdlib/sys.ml
+++ b/stdlib/sys.ml
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: sys.ml,v 1.101.2.14 2004/11/22 16:25:38 doligez Exp $ *)
+(* $Id: sys.ml,v 1.101.2.22 2005/03/16 12:05:33 doligez Exp $ *)
 
 (* System interface *)
 
@@ -78,4 +78,4 @@ let catch_break on =
 
 (* OCaml version string, must be in the format described in sys.mli. *)
 
-let ocaml_version = "3.08.2";;
+let ocaml_version = "3.08.3";;

diff --git a/tools/.depend b/tools/.depend
index 035fd88b965de22df5e4bcd7cd9ed045be2096cf..e52904cc67bafec311cc0b4f66619424ed781194 100644 (file)
--- a/tools/.depend
+++ b/tools/.depend
@@ -1,48 +1,48 @@
 depend.cmi: ../parsing/parsetree.cmi 
-addlabels.cmo: ../parsing/asttypes.cmi ../parsing/location.cmi \
-    ../parsing/longident.cmi ../parsing/parse.cmi ../parsing/parsetree.cmi 
-addlabels.cmx: ../parsing/asttypes.cmi ../parsing/location.cmx \
-    ../parsing/longident.cmx ../parsing/parse.cmx ../parsing/parsetree.cmi 
-depend.cmo: ../parsing/location.cmi ../parsing/longident.cmi \
-    ../parsing/parsetree.cmi depend.cmi 
-depend.cmx: ../parsing/location.cmx ../parsing/longident.cmx \
-    ../parsing/parsetree.cmi depend.cmi 
-dumpapprox.cmo: ../asmcomp/clambda.cmi ../asmcomp/compilenv.cmi \
-    ../utils/config.cmi 
-dumpapprox.cmx: ../asmcomp/clambda.cmx ../asmcomp/compilenv.cmx \
-    ../utils/config.cmx 
-dumpobj.cmo: ../parsing/asttypes.cmi ../bytecomp/bytesections.cmi \
-    ../utils/config.cmi ../bytecomp/emitcode.cmi ../typing/ident.cmi \
-    ../bytecomp/instruct.cmi ../bytecomp/lambda.cmi ../bytecomp/opcodes.cmo \
-    opnames.cmo ../utils/tbl.cmi 
-dumpobj.cmx: ../parsing/asttypes.cmi ../bytecomp/bytesections.cmx \
-    ../utils/config.cmx ../bytecomp/emitcode.cmx ../typing/ident.cmx \
-    ../bytecomp/instruct.cmx ../bytecomp/lambda.cmx ../bytecomp/opcodes.cmx \
-    opnames.cmx ../utils/tbl.cmx 
-lexer301.cmo: ../parsing/location.cmi ../utils/misc.cmi ../utils/warnings.cmi 
-lexer301.cmx: ../parsing/location.cmx ../utils/misc.cmx ../utils/warnings.cmx 
-objinfo.cmo: ../utils/config.cmi ../bytecomp/emitcode.cmi 
-objinfo.cmx: ../utils/config.cmx ../bytecomp/emitcode.cmx 
+addlabels.cmo: ../parsing/parsetree.cmi ../parsing/parse.cmi \
+    ../parsing/longident.cmi ../parsing/location.cmi ../parsing/asttypes.cmi 
+addlabels.cmx: ../parsing/parsetree.cmi ../parsing/parse.cmx \
+    ../parsing/longident.cmx ../parsing/location.cmx ../parsing/asttypes.cmi 
+depend.cmo: ../parsing/parsetree.cmi ../parsing/longident.cmi \
+    ../parsing/location.cmi depend.cmi 
+depend.cmx: ../parsing/parsetree.cmi ../parsing/longident.cmx \
+    ../parsing/location.cmx depend.cmi 
+dumpapprox.cmo: ../utils/config.cmi ../asmcomp/compilenv.cmi \
+    ../asmcomp/clambda.cmi 
+dumpapprox.cmx: ../utils/config.cmx ../asmcomp/compilenv.cmx \
+    ../asmcomp/clambda.cmx 
+dumpobj.cmo: ../utils/tbl.cmi opnames.cmo ../bytecomp/opcodes.cmo \
+    ../bytecomp/lambda.cmi ../bytecomp/instruct.cmi ../typing/ident.cmi \
+    ../bytecomp/emitcode.cmi ../utils/config.cmi ../bytecomp/bytesections.cmi \
+    ../parsing/asttypes.cmi 
+dumpobj.cmx: ../utils/tbl.cmx opnames.cmx ../bytecomp/opcodes.cmx \
+    ../bytecomp/lambda.cmx ../bytecomp/instruct.cmx ../typing/ident.cmx \
+    ../bytecomp/emitcode.cmx ../utils/config.cmx ../bytecomp/bytesections.cmx \
+    ../parsing/asttypes.cmi 
+lexer301.cmo: ../utils/warnings.cmi ../utils/misc.cmi ../parsing/location.cmi 
+lexer301.cmx: ../utils/warnings.cmx ../utils/misc.cmx ../parsing/location.cmx 
+objinfo.cmo: ../bytecomp/emitcode.cmi ../utils/config.cmi 
+objinfo.cmx: ../bytecomp/emitcode.cmx ../utils/config.cmx 
 ocamlcp.cmo: ../driver/main_args.cmi 
 ocamlcp.cmx: ../driver/main_args.cmx 
-ocamldep.cmo: ../utils/clflags.cmo ../utils/config.cmi depend.cmi \
-    ../parsing/lexer.cmi ../parsing/location.cmi ../parsing/longident.cmi \
-    ../utils/misc.cmi ../parsing/parse.cmi ../parsing/parsetree.cmi \
-    ../parsing/syntaxerr.cmi 
-ocamldep.cmx: ../utils/clflags.cmx ../utils/config.cmx depend.cmx \
-    ../parsing/lexer.cmx ../parsing/location.cmx ../parsing/longident.cmx \
-    ../utils/misc.cmx ../parsing/parse.cmx ../parsing/parsetree.cmi \
-    ../parsing/syntaxerr.cmx 
+ocamldep.cmo: ../parsing/syntaxerr.cmi ../parsing/parsetree.cmi \
+    ../parsing/parse.cmi ../utils/misc.cmi ../parsing/longident.cmi \
+    ../parsing/location.cmi ../parsing/lexer.cmi depend.cmi \
+    ../utils/config.cmi ../utils/clflags.cmo 
+ocamldep.cmx: ../parsing/syntaxerr.cmx ../parsing/parsetree.cmi \
+    ../parsing/parse.cmx ../utils/misc.cmx ../parsing/longident.cmx \
+    ../parsing/location.cmx ../parsing/lexer.cmx depend.cmx \
+    ../utils/config.cmx ../utils/clflags.cmx 
 ocamlmktop.cmo: ../utils/ccomp.cmi 
 ocamlmktop.cmx: ../utils/ccomp.cmx 
-ocamlprof.cmo: ../utils/clflags.cmo ../utils/config.cmi ../parsing/lexer.cmi \
-    ../parsing/location.cmi ../utils/misc.cmi ../parsing/parse.cmi \
-    ../parsing/parsetree.cmi ../parsing/syntaxerr.cmi 
-ocamlprof.cmx: ../utils/clflags.cmx ../utils/config.cmx ../parsing/lexer.cmx \
-    ../parsing/location.cmx ../utils/misc.cmx ../parsing/parse.cmx \
-    ../parsing/parsetree.cmi ../parsing/syntaxerr.cmx 
-primreq.cmo: ../utils/config.cmi ../bytecomp/emitcode.cmi 
-primreq.cmx: ../utils/config.cmx ../bytecomp/emitcode.cmx 
+ocamlprof.cmo: ../parsing/syntaxerr.cmi ../parsing/parsetree.cmi \
+    ../parsing/parse.cmi ../utils/misc.cmi ../parsing/location.cmi \
+    ../parsing/lexer.cmi ../utils/config.cmi ../utils/clflags.cmo 
+ocamlprof.cmx: ../parsing/syntaxerr.cmx ../parsing/parsetree.cmi \
+    ../parsing/parse.cmx ../utils/misc.cmx ../parsing/location.cmx \
+    ../parsing/lexer.cmx ../utils/config.cmx ../utils/clflags.cmx 
+primreq.cmo: ../bytecomp/emitcode.cmi ../utils/config.cmi 
+primreq.cmx: ../bytecomp/emitcode.cmx ../utils/config.cmx 
 profiling.cmo: profiling.cmi 
 profiling.cmx: profiling.cmi 
 scrapelabels.cmo: lexer301.cmo 

diff --git a/tools/CVS/Entries b/tools/CVS/Entries
new file mode 100644 (file)
index 0000000..52de2da
--- /dev/null
+++ b/tools/CVS/Entries
@@ -0,0 +1,38 @@
+/.cvsignore/1.19/Fri Nov 15 16:16:06 2002//Tocaml3083
+/.depend/1.22.2.2/Tue Feb 22 14:33:37 2005//Tocaml3083
+/Characters/1.3/Mon Nov 29 19:04:21 1999//Tocaml3083
+/DoMake/1.5/Mon Nov 29 19:04:23 1999//Tocaml3083
+/MakeDepend/1.3/Mon Nov 29 19:04:25 1999//Tocaml3083
+/Makefile/1.59.2.1/Mon Jan 24 15:22:46 2005//Tocaml3083
+/Makefile.nt/1.24/Mon Mar 24 15:23:30 2003//Tocaml3083
+/OCamlc-custom/1.1/Sat Nov  2 18:05:21 1996//Tocaml3083
+/Time/1.2/Sat Jul  4 17:32:15 1998//Tocaml3083
+/addlabels.ml/1.10/Tue Nov 25 09:20:45 2003//Tocaml3083
+/checkstack.c/1.2/Fri Aug  9 11:10:34 2002//Tocaml3083
+/cleanup-header/1.2/Mon Mar 18 06:55:42 2002//Tocaml3083
+/cvt_emit.mll/1.4/Mon Oct  2 14:17:55 2000//Tocaml3083
+/depend.ml/1.7/Tue Nov 25 09:20:45 2003//Tocaml3083
+/depend.mli/1.2/Thu Apr 18 07:27:43 2002//Tocaml3083
+/dumpapprox.ml/1.15/Thu Mar  6 16:00:16 2003//Tocaml3083
+/dumpobj.ml/1.34/Wed May 26 11:10:52 2004//Tocaml3083
+/keywords.r/1.3/Fri Dec  7 13:41:01 2001//Tocaml3083
+/lexer299.mll/1.3/Wed Mar 10 08:56:01 2004//Tocaml3083
+/lexer301.mll/1.4/Fri Jan 16 15:24:03 2004//Tocaml3083
+/magic/1.1/Tue Nov 27 13:39:36 2001/-kk/Tocaml3083
+/make-opcodes/1.1/Thu May  4 10:14:22 1995//Tocaml3083
+/make-package-macosx/1.8.4.2/Wed Dec 22 16:08:09 2004//Tocaml3083
+/objinfo.ml/1.8/Mon Mar 27 12:18:09 2000//Tocaml3083
+/ocaml-objcopy-macosx/1.1.2.1/Tue Jan 25 13:13:52 2005//Tocaml3083
+/ocaml299to3.ml/1.6/Wed Oct  3 01:34:05 2001//Tocaml3083
+/ocamlcp.ml/1.37.6.1/Wed Mar  9 15:49:09 2005//Tocaml3083
+/ocamldep.ml/1.33.4.1/Wed Jan  5 15:20:26 2005//Tocaml3083
+/ocamlmklib.mlp/1.10.2.1/Thu Jul  8 06:45:51 2004//Tocaml3083
+/ocamlmktop.ml/1.6/Mon Mar 24 15:27:01 2003//Tocaml3083
+/ocamlmktop.tpl/1.5/Sun Feb 22 14:52:50 2004//Tocaml3083
+/ocamlprof.ml/1.37.2.1/Thu Nov 18 23:52:08 2004//Tocaml3083
+/ocamlsize/1.6/Thu Aug 21 13:52:25 2003//Tocaml3083
+/primreq.ml/1.3/Mon Mar 27 12:18:09 2000//Tocaml3083
+/profiling.ml/1.6.10.1/Thu Nov 18 23:52:08 2004//Tocaml3083
+/profiling.mli/1.5.10.1/Thu Nov 18 23:52:08 2004//Tocaml3083
+/scrapelabels.ml/1.6/Thu Oct  4 01:55:02 2001//Tocaml3083
+D

diff --git a/tools/CVS/Repository b/tools/CVS/Repository
new file mode 100644 (file)
index 0000000..a9e21f6
--- /dev/null
+++ b/tools/CVS/Repository
@@ -0,0 +1 @@
+csl/tools

diff --git a/tools/CVS/Root b/tools/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/tools/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/tools/CVS/Tag b/tools/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/tools/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/tools/Makefile b/tools/Makefile
index 04a6f0dc26bd06afaaa4d6007bdb9134709a9dcb..ce1a6b85d7e2172a99c340d93a8aa47036d7139b 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile,v 1.59 2004/06/20 15:26:06 xleroy Exp $
+# $Id: Makefile,v 1.59.2.1 2005/01/24 15:22:46 doligez Exp $
 
 include ../config/Makefile
 
@@ -112,6 +112,11 @@ beforedepend:: ocamlmklib.ml
 clean::
        rm -f ocamlmklib.ml
 
+# ocamlopt -pack support for Mac OS X: objcopy emulator
+
+install::
+       $(BINUTILS_INSTALL_OBJCOPY) ocaml-objcopy-macosx $(BINUTILS_OBJCOPY)
+
 # Converter olabl/ocaml 2.99 to ocaml 3
 
 OCAML299TO3= lexer299.cmo ocaml299to3.cmo

diff --git a/tools/make-package-macosx b/tools/make-package-macosx
index 41ab8fd55ef6f5d1ad11ca6f7884f209baa36d18..93b875254e1f6f0151b4344c6edd3767188c4b38 100755 (executable)
--- a/tools/make-package-macosx
+++ b/tools/make-package-macosx
@@ -12,7 +12,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: make-package-macosx,v 1.8 2004/04/29 12:16:58 doligez Exp $
+# $Id: make-package-macosx,v 1.8.4.2 2004/12/22 16:08:09 doligez Exp $
 
 cd package-macosx
 rm -rf ocaml.pkg ocaml-rw.dmg
@@ -79,7 +79,7 @@ cat >Info.plist <<EOF
         <key>IFPkgFlagAuthorizationAction</key>
         <string>AdminAuthorization</string>
         <key>IFPkgFlagDefaultLocation</key>
-        <string>/</string>
+        <string>/usr/local</string>
         <key>IFPkgFlagInstallFat</key>
         <false/>
         <key>IFPkgFlagIsRequired</key>
@@ -107,6 +107,9 @@ You need Mac OS X 10.3 (panther), with X11 and the
 XCode tools installed.
 EOF
 
+chmod -R g-w root
+sudo chown -R root:admin root
+
 /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker \
   -build -p "`pwd`/ocaml.pkg" -f "`pwd`/root" -i "`pwd`/Info.plist" \
   -d "`pwd`/Description.plist" -r "`pwd`/resources"
@@ -131,4 +134,4 @@ open "/Volumes/Objective Caml"
 hdiutil detach $name
 
 rm -rf "ocaml-${VERSION}.dmg"
-hdiutil convert ocaml-rw.dmg -format UDZO -o "ocaml${VERSION}.dmg"
+hdiutil convert ocaml-rw.dmg -format UDZO -o "ocaml-${VERSION}.dmg"

diff --git a/tools/ocaml-objcopy-macosx b/tools/ocaml-objcopy-macosx
new file mode 100755 (executable)
index 0000000..6798490
--- /dev/null
+++ b/tools/ocaml-objcopy-macosx
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#########################################################################
+#                                                                       #
+#                            Objective Caml                             #
+#                                                                       #
+#           Damien Doligez, projet Cristal, INRIA Rocquencourt          #
+#                                                                       #
+#   Copyright 2005 Institut National de Recherche en Informatique et    #
+#   en Automatique.  All rights reserved.  This file is distributed     #
+#   under the terms of the Q Public License version 1.0.                #
+#                                                                       #
+#########################################################################
+
+# $Id: ocaml-objcopy-macosx,v 1.1.2.1 2005/01/25 13:13:52 doligez Exp $
+
+
+TEMP=/tmp/ocaml-objcopy-$$.o
+UNDEF=/tmp/ocaml-objcopy-$$.sym
+
+usage () {
+  echo "usage: objcopy {--redefine-sym <old>=<new>} file.o" >&2
+  exit 2
+}
+
+: > "$UNDEF"
+
+while : ; do
+  case $# in
+    0) break;;
+    *) case $1 in
+         --redefine-sym)
+           case $2 in
+             *=*) ALIAS="$ALIAS -i${2#*=}:${2%%=*}"
+                  echo ${2%%=*} >>"$UNDEF"
+                  ;;
+             *) usage;;
+           esac
+           shift 2
+           ;;
+         -*) usage;;
+         *) case $FILE in
+              "") FILE=$1; shift;;
+              *) usage;;
+            esac;;
+       esac;;
+  esac
+done
+
+ld -o "$TEMP" -r $ALIAS "$FILE"
+ld -o "$FILE" -r -unexported_symbols_list "$UNDEF" "$TEMP"
+
+rm -f "$TEMP" "$UNDEF"

diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index be43fa08e317f26176f2e94919b9d8650e757ddc..cbc22b9b638448ffa61a5e2aeab7666732299c27 100644 (file)
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ocamlcp.ml,v 1.37 2003/07/17 08:38:28 xleroy Exp $ *)
+(* $Id: ocamlcp.ml,v 1.37.6.1 2005/03/09 15:49:09 doligez Exp $ *)
 
 open Printf
 
@@ -41,8 +41,6 @@ let incompatible o =
   fprintf stderr "ocamlcp: profiling is incompatible with the %s option\n" o;
   exit 2
 
-let ismultithreaded = ref ""
-
 module Options = Main_args.Make_options (struct
   let _a () = make_archive := true; option "-a" ()
   let _c = option "-c"
@@ -72,8 +70,8 @@ module Options = Main_args.Make_options (struct
   let _pp s = incompatible "-pp"
   let _principal = option "-principal"
   let _rectypes = option "-rectypes"
-  let _thread () = ismultithreaded := "-thread"; option "-thread" ()
-  let _vmthread () = ismultithreaded := "-vmthread"; option "-vmthread" ()
+  let _thread () = option "-thread" ()
+  let _vmthread () = option "-vmthread" ()
   let _unsafe = option "-unsafe"
   let _use_prims s = option_with_arg "-use-prims" s
   let _use_runtime s = option_with_arg "-use-runtime" s
@@ -124,8 +122,7 @@ if !with_impl then profargs := "-impl" :: !profargs;
 if !with_intf then profargs := "-intf" :: !profargs;
 let status =
   Sys.command
-    (Printf.sprintf "ocamlc -pp \"ocamlprof %s -instrument %s\" %s %s"
-        !ismultithreaded
+    (Printf.sprintf "ocamlc -pp \"ocamlprof -instrument %s\" %s %s"
         (String.concat " " (List.rev !profargs))
         (if !make_archive then "" else "profiling.cmo")
         (String.concat " " (List.rev !compargs)))

diff --git a/tools/ocamldep.ml b/tools/ocamldep.ml
index 4edbe0f7f5745983b226cf70e76f50d2ebffe767..3c874e2540a3e8d24c6aac60ca1b93cdc274a5d2 100644 (file)
--- a/tools/ocamldep.ml
+++ b/tools/ocamldep.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ocamldep.ml,v 1.33 2004/01/16 15:24:03 doligez Exp $ *)
+(* $Id: ocamldep.ml,v 1.33.4.1 2005/01/05 15:20:26 doligez Exp $ *)
 
 open Format
 open Location
@@ -75,19 +75,46 @@ let find_dependency modname (byt_deps, opt_deps) =
 
 let (depends_on, escaped_eol) = (": ", "\\\n    ")
 
+let print_filename s =
+  if not (String.contains s ' ') then begin
+    print_string s;
+  end else begin
+    let rec count n i =
+      if i >= String.length s then n
+      else if s.[i] = ' ' then count (n+1) (i+1)
+      else count n (i+1)
+    in
+    let spaces = count 0 0 in
+    let result = String.create (String.length s + spaces) in
+    let rec loop i j =
+      if i >= String.length s then ()
+      else if s.[i] = ' ' then begin
+        result.[j] <- '\\';
+        result.[j+1] <- ' ';
+        loop (i+1) (j+2);
+      end else begin
+        result.[j] <- s.[i];
+        loop (i+1) (j+1);
+      end
+    in
+    loop 0 0;
+    print_string result;
+  end
+;;
+
 let print_dependencies target_file deps =
   match deps with
     [] -> ()
   | _ ->
-    print_string target_file; print_string depends_on;
+    print_filename target_file; print_string depends_on;
     let rec print_items pos = function
       [] -> print_string "\n"
     | dep :: rem ->
         if pos + String.length dep <= 77 then begin
-          print_string dep; print_string " ";
+          print_filename dep; print_string " ";
           print_items (pos + String.length dep + 1) rem
         end else begin
-          print_string escaped_eol; print_string dep; print_string " ";
+          print_string escaped_eol; print_filename dep; print_string " ";
           print_items (String.length dep + 5) rem
         end in
     print_items (String.length target_file + 2) deps

diff --git a/toplevel/CVS/Entries b/toplevel/CVS/Entries
new file mode 100644 (file)
index 0000000..ab20879
--- /dev/null
+++ b/toplevel/CVS/Entries
@@ -0,0 +1,13 @@
+/expunge.ml/1.16/Fri Jan 16 15:24:03 2004//Tocaml3083
+/genprintval.ml/1.37/Sun Jun 13 16:23:35 2004//Tocaml3083
+/genprintval.mli/1.10/Thu Apr 18 07:27:44 2002//Tocaml3083
+/topdirs.ml/1.62.2.1/Wed Jun 23 12:10:02 2004//Tocaml3083
+/topdirs.mli/1.12/Thu Apr 18 07:27:44 2002//Tocaml3083
+/toploop.ml/1.87/Sat Jun 12 08:55:47 2004//Tocaml3083
+/toploop.mli/1.25/Sat May 15 09:59:37 2004//Tocaml3083
+/topmain.ml/1.34/Fri Jul 25 12:18:25 2003//Tocaml3083
+/topmain.mli/1.1/Wed Apr 24 08:02:51 2002//Tocaml3083
+/topstart.ml/1.1/Wed Apr 24 08:02:51 2002//Tocaml3083
+/trace.ml/1.20/Thu Apr 19 08:34:20 2001//Tocaml3083
+/trace.mli/1.9/Mon Mar  6 22:11:55 2000//Tocaml3083
+D

diff --git a/toplevel/CVS/Repository b/toplevel/CVS/Repository
new file mode 100644 (file)
index 0000000..ab280a7
--- /dev/null
+++ b/toplevel/CVS/Repository
@@ -0,0 +1 @@
+csl/toplevel

diff --git a/toplevel/CVS/Root b/toplevel/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/toplevel/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/toplevel/CVS/Tag b/toplevel/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/toplevel/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/typing/CVS/Entries b/typing/CVS/Entries
new file mode 100644 (file)
index 0000000..528a155
--- /dev/null
+++ b/typing/CVS/Entries
@@ -0,0 +1,50 @@
+/btype.ml/1.35/Tue Jan  6 13:41:39 2004//Tocaml3083
+/btype.mli/1.16/Tue Jan  6 13:41:39 2004//Tocaml3083
+/ctype.ml/1.179.2.2/Thu Dec  9 07:36:31 2004//Tocaml3083
+/ctype.mli/1.52.8.1/Thu Dec  9 07:36:31 2004//Tocaml3083
+/datarepr.ml/1.13/Wed Jul  2 09:14:32 2003//Tocaml3083
+/datarepr.mli/1.9/Wed Jul  2 09:14:32 2003//Tocaml3083
+/env.ml/1.54/Sat Jun 12 08:55:47 2004//Tocaml3083
+/env.mli/1.28/Tue Nov 25 09:20:42 2003//Tocaml3083
+/ident.ml/1.23/Sun Jan  4 14:32:34 2004//Tocaml3083
+/ident.mli/1.17/Sun Jan  4 14:32:34 2004//Tocaml3083
+/includeclass.ml/1.7/Mon Mar  6 22:11:57 2000//Tocaml3083
+/includeclass.mli/1.3/Mon Mar  6 22:11:58 2000//Tocaml3083
+/includecore.ml/1.29/Wed Jul  2 09:14:33 2003//Tocaml3083
+/includecore.mli/1.10/Wed Nov 17 18:58:54 1999//Tocaml3083
+/includemod.ml/1.34/Sat Jun 12 08:55:47 2004//Tocaml3083
+/includemod.mli/1.12/Mon Mar  6 22:12:00 2000//Tocaml3083
+/mtype.ml/1.25/Sat Jun 12 08:55:47 2004//Tocaml3083
+/mtype.mli/1.10/Fri Apr  9 13:32:28 2004//Tocaml3083
+/oprint.ml/1.19/Sat Jun 12 08:55:47 2004//Tocaml3083
+/oprint.mli/1.2/Thu Apr 18 07:27:45 2002//Tocaml3083
+/outcometree.mli/1.12/Sat Jun 12 08:55:48 2004//Tocaml3083
+/parmatch.ml/1.65.8.1/Wed Feb  2 06:57:53 2005//Tocaml3083
+/parmatch.mli/1.9/Mon Aug 18 08:26:18 2003//Tocaml3083
+/path.ml/1.9/Tue Jul  1 13:05:43 2003//Tocaml3083
+/path.mli/1.8/Tue Jul  1 13:05:43 2003//Tocaml3083
+/predef.ml/1.29/Sun Jan  4 14:32:34 2004//Tocaml3083
+/predef.mli/1.14/Sat Jul  5 11:13:24 2003//Tocaml3083
+/primitive.ml/1.8/Mon Aug  6 12:28:49 2001//Tocaml3083
+/primitive.mli/1.7/Mon Aug  6 12:28:49 2001//Tocaml3083
+/printtyp.ml/1.130.2.2/Thu Dec  9 09:11:01 2004//Tocaml3083
+/printtyp.mli/1.26/Sat Jun 12 08:55:48 2004//Tocaml3083
+/stypes.ml/1.8/Fri Jul 25 18:00:40 2003//Tocaml3083
+/stypes.mli/1.3/Wed Jul 23 16:52:41 2003//Tocaml3083
+/subst.ml/1.46/Sat Jun 12 08:55:48 2004//Tocaml3083
+/subst.mli/1.12/Thu Apr 18 07:27:45 2002//Tocaml3083
+/typeclass.ml/1.78/Mon May 31 02:01:59 2004//Tocaml3083
+/typeclass.mli/1.18/Mon Dec  1 00:32:11 2003//Tocaml3083
+/typecore.ml/1.160.2.1/Mon Jun 21 20:36:20 2004//Tocaml3083
+/typecore.mli/1.35/Tue Nov 25 09:20:42 2003//Tocaml3083
+/typedecl.ml/1.67.10.2/Thu Dec  9 10:15:43 2004//Tocaml3083
+/typedecl.mli/1.26/Tue Jul  1 13:05:43 2003//Tocaml3083
+/typedtree.ml/1.36/Tue Nov 25 09:20:43 2003//Tocaml3083
+/typedtree.mli/1.34/Tue Nov 25 09:20:43 2003//Tocaml3083
+/typemod.ml/1.69.2.1/Wed Jan 12 17:01:58 2005//Tocaml3083
+/typemod.mli/1.24/Sun Jun 13 12:48:01 2004//Tocaml3083
+/types.ml/1.24/Sat Jun 12 08:55:49 2004//Tocaml3083
+/types.mli/1.24/Sat Jun 12 08:55:49 2004//Tocaml3083
+/typetexp.ml/1.49/Mon Jun 30 08:04:42 2003//Tocaml3083
+/typetexp.mli/1.19/Mon May 19 09:21:17 2003//Tocaml3083
+D

diff --git a/typing/CVS/Repository b/typing/CVS/Repository
new file mode 100644 (file)
index 0000000..be71e33
--- /dev/null
+++ b/typing/CVS/Repository
@@ -0,0 +1 @@
+csl/typing

diff --git a/typing/CVS/Root b/typing/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/typing/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/typing/CVS/Tag b/typing/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/typing/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/typing/ctype.ml b/typing/ctype.ml
index c08b3051c9465cc732e0811aec1ee365a9e6b1a0..a029801afd0ed5f44adcbc7ad9580d1327d15718 100644 (file)
--- a/typing/ctype.ml
+++ b/typing/ctype.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ctype.ml,v 1.179.2.1 2004/07/07 01:45:21 garrigue Exp $ *)
+(* $Id: ctype.ml,v 1.179.2.2 2004/12/09 07:36:31 garrigue Exp $ *)
 
 (* Operations on core types *)
 
@@ -405,6 +405,11 @@ let free_vars ty =
   free_variables := [];
   res
 
+let free_variables ty =
+  let tl = List.map fst (free_vars ty) in
+  unmark_type ty;
+  tl
+
 let rec closed_type ty =
   match free_vars ty with
       []           -> ()

diff --git a/typing/ctype.mli b/typing/ctype.mli
index 6d8ad2b72155d261212b21dda2c3309d27206c01..39f7d550d323912fcb2dffbb3285bb9ae761f651 100644 (file)
--- a/typing/ctype.mli
+++ b/typing/ctype.mli
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ctype.mli,v 1.52 2003/11/25 09:20:41 garrigue Exp $ *)
+(* $Id: ctype.mli,v 1.52.8.1 2004/12/09 07:36:31 garrigue Exp $ *)
 
 (* Operations on core types *)
 
@@ -219,6 +219,7 @@ val closed_schema: type_expr -> bool
         (* Check whether the given type scheme contains no non-generic
            type variables *)
 
+val free_variables: type_expr -> type_expr list
 val closed_type_decl: type_declaration -> type_expr option
 type closed_class_failure =
     CC_Method of type_expr * bool * string * type_expr

diff --git a/typing/parmatch.ml b/typing/parmatch.ml
index 93004e3cc25b62ed01069367fd04efc48bf094d9..09bdf848398979749344271e115291e0c12d523b 100644 (file)
--- a/typing/parmatch.ml
+++ b/typing/parmatch.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: parmatch.ml,v 1.65 2004/01/16 14:09:30 maranget Exp $ *)
+(* $Id: parmatch.ml,v 1.65.8.1 2005/02/02 06:57:53 garrigue Exp $ *)
 
 (* Detection of partial matches and unused match cases. *)
 
@@ -601,11 +601,10 @@ let full_match closing env =  match env with
         row.row_fields
     else
       row.row_closed &&
-      let count =
-        List.fold_left
-          (fun n (_,f) -> if Btype.row_field_repr f = Rabsent then n else n+1)
-          0 row.row_fields in
-      List.length fields = count
+      List.for_all
+        (fun (tag,f) ->
+          Btype.row_field_repr f = Rabsent || List.mem tag fields)
+        row.row_fields
 | ({pat_desc = Tpat_constant(Const_char _)},_) :: _ ->
     List.length env = 256
 | ({pat_desc = Tpat_constant(_)},_) :: _ -> false

diff --git a/typing/printtyp.ml b/typing/printtyp.ml
index e40dedab7a3f6124dd2f0de3c9b8efa0da43da2a..e494f4b7af309bd48589b406c9b3363b60e0a48d 100644 (file)
--- a/typing/printtyp.ml
+++ b/typing/printtyp.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: printtyp.ml,v 1.130.2.1 2004/07/07 01:45:21 garrigue Exp $ *)
+(* $Id: printtyp.ml,v 1.130.2.2 2004/12/09 09:11:01 garrigue Exp $ *)
 
 (* Printing functions *)
 
@@ -398,11 +398,8 @@ and tree_of_row_field sch (l, f) =
       else (l, false, tree_of_typlist sch tyl)
   | Rabsent -> (l, false, [] (* une erreur, en fait *))
 
-and tree_of_typlist sch = function
-  | [] -> []
-  | ty :: tyl ->
-      let tr = tree_of_typexp sch ty in
-      tr :: tree_of_typlist sch tyl
+and tree_of_typlist sch tyl =
+  List.map (tree_of_typexp sch) tyl
 
 and tree_of_typobject sch fi nm =
   begin match !nm with
@@ -531,8 +528,12 @@ let rec tree_of_type_decl id decl =
     | _ -> "?"
   in
   let type_defined decl =
-    if decl.type_kind = Type_abstract && ty_manifest = None
-       && List.exists (fun x -> x <> (true,true,true)) decl.type_variance then
+    if List.exists2
+        (fun ty x -> x <> (true,true,true) &&
+          (decl.type_kind = Type_abstract && ty_manifest = None
+         || (repr ty).desc <> Tvar))
+        decl.type_params decl.type_variance
+    then
       let vari = List.map (fun (co,cn,ct) -> (co,cn)) decl.type_variance in
       (Ident.name id,
        List.combine
@@ -703,11 +704,9 @@ let class_type ppf cty =
   prepare_class_type [] cty;
   !Oprint.out_class_type ppf (tree_of_class_type false [] cty)
 
-let tree_of_class_params = function
-  | [] -> []
-  | params ->
-      let tyl = tree_of_typlist true params in
-      List.map (function Otyp_var (_, s) -> s | _ -> "?") tyl
+let tree_of_class_params params =
+  let tyl = tree_of_typlist true params in
+  List.map (function Otyp_var (_, s) -> s | _ -> "?") tyl
 
 let tree_of_class_declaration id cl rs =
   let params = filter_params cl.cty_params in

diff --git a/typing/typedecl.ml b/typing/typedecl.ml
index 86a212e6d910f853afcd58698446e94cffce37fe..4ca6e3a034a10071ab91896a5a1bfb351ea2b629 100644 (file)
--- a/typing/typedecl.ml
+++ b/typing/typedecl.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typedecl.ml,v 1.67 2003/11/07 00:19:08 garrigue Exp $ *)
+(* $Id: typedecl.ml,v 1.67.10.2 2004/12/09 10:15:43 garrigue Exp $ *)
 
 (**** Typing of type definitions ****)
 
@@ -416,14 +416,32 @@ let compute_variance env tvl nega posi cntr ty =
       if TypeSet.mem ty !cvisited then ctvar := true)
     tvl
 
-let compute_variance_decl env decl (required, loc) =
+let make_variance ty = (ty, ref false, ref false, ref false)
+let whole_type decl =
+  match decl.type_kind with
+    Type_variant (tll,_) ->
+      Btype.newgenty
+        (Ttuple (List.map (fun (_, tl) -> Btype.newgenty (Ttuple tl)) tll))
+  | Type_record (ftl, _, _) ->
+      Btype.newgenty
+        (Ttuple (List.map (fun (_, _, ty) -> ty) ftl))
+  | Type_abstract ->
+      match decl.type_manifest with
+        Some ty -> ty
+      | _ -> Btype.newgenty (Ttuple [])
+
+let compute_variance_decl env sharp decl (required, loc) =
   if decl.type_kind = Type_abstract && decl.type_manifest = None then
     List.map (fun (c, n) -> if c || n then (c, n, n) else (true, true, true))
       required
   else
-  let tvl =
-    List.map (fun ty -> (Btype.repr ty, ref false, ref false, ref false))
-      decl.type_params in
+  let params = List.map Btype.repr decl.type_params in
+  let tvl0 = List.map make_variance params in
+  let fvl = Ctype.free_variables (whole_type decl) in
+  let fvl = List.filter (fun v -> not (List.memq v params)) fvl in
+  let tvl1 = List.map make_variance fvl in
+  let tvl2 = List.map make_variance fvl in
+  let tvl = tvl0 @ tvl1 in
   begin match decl.type_kind with
     Type_abstract ->
       begin match decl.type_manifest with
@@ -442,12 +460,31 @@ let compute_variance_decl env decl (required, loc) =
          compute_variance env tvl true cn cn ty)
         ftl
   end;
+  List.iter2
+    (fun (ty, co, cn, ct) (c, n) ->
+      if ty.desc <> Tvar then begin
+        let (c, n) = if c || n then (c, n) else (true, true) in
+        co := c; cn := n; ct := n;
+        compute_variance env tvl2 c n n ty
+      end)
+    tvl0 required;
+  if not sharp then
+    List.iter2
+      (fun (_, c1, n1, t1) (_, c2, n2, t2) ->
+        if !c1 && not !c2 || !n1 && not !n2 ||
+           !t1 && not !t2 && decl.type_kind = Type_abstract
+        then raise (Error(loc, Bad_variance)))
+      tvl1 tvl2;
   List.map2
     (fun (_, co, cn, ct) (c, n) ->
       if c && !cn || n && !co then raise (Error(loc, Bad_variance));
       let ct = if decl.type_kind = Type_abstract then ct else cn in
       (!co, !cn, !ct))
-    tvl required
+    tvl0 required
+
+let is_sharp id =
+  let s = Ident.name id in
+  String.length s > 0 && s.[0] = '#'
 
 let rec compute_variance_fixpoint env decls required variances =
   let new_decls =
@@ -460,7 +497,8 @@ let rec compute_variance_fixpoint env decls required variances =
       new_decls env
   in
   let new_variances =
-    List.map2 (fun (_, decl) -> compute_variance_decl new_env decl)
+    List.map2
+      (fun (id, decl) -> compute_variance_decl new_env (is_sharp id) decl)
       new_decls required
   in
   let new_variances =
@@ -472,12 +510,13 @@ let rec compute_variance_fixpoint env decls required variances =
   else
     compute_variance_fixpoint env decls required new_variances
 
+let init_variance (id, decl) =
+  List.map (fun _ -> (false, false, false)) decl.type_params
+
 (* for typeclass.ml *)
 let compute_variance_decls env decls =
   let decls, required = List.split decls in
-  let variances =
-    List.map (fun (l,_) -> List.map (fun _ -> false, false, false) l) required
-  in
+  let variances = List.map init_variance decls in
   fst (compute_variance_fixpoint env decls required variances)
 
 (* Translate a set of mutually recursive type declarations *)
@@ -535,11 +574,8 @@ let transl_type_decl env name_sdecl_list =
       name_sdecl_list
   in
   let final_decls, final_env =
-    compute_variance_fixpoint env decls required
-      (List.map
-         (fun (_,decl) -> List.map (fun _ -> (false, false, false))
-            decl.type_params)
-         decls) in
+    compute_variance_fixpoint env decls required (List.map init_variance decls)
+  in
   (* Done *)
   (final_decls, final_env)
 
@@ -614,7 +650,8 @@ let transl_with_constraint env sdecl =
     raise(Error(sdecl.ptype_loc, Unbound_type_var));
   let decl =
     {decl with type_variance =
-     compute_variance_decl env decl (sdecl.ptype_variance, sdecl.ptype_loc)} in
+     compute_variance_decl env false decl
+       (sdecl.ptype_variance, sdecl.ptype_loc)} in
   Ctype.end_def();
   generalize_decl decl;
   decl

diff --git a/typing/typemod.ml b/typing/typemod.ml
index a85eb4a1f1614b58817a17faa90589b1c50d7f7a..ce13c18a5016b570ed6a5a5c69b18cb12c9fb3a4 100644 (file)
--- a/typing/typemod.ml
+++ b/typing/typemod.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typemod.ml,v 1.69 2004/06/13 12:48:01 xleroy Exp $ *)
+(* $Id: typemod.ml,v 1.69.2.1 2005/01/12 17:01:58 doligez Exp $ *)
 
 (* Type-checking of the module language *)
 
@@ -802,6 +802,9 @@ let package_units objfiles cmifile modulename =
   let mlifile =
     chop_extension_if_any cmifile ^ !Config.interface_suffix in
   if Sys.file_exists mlifile then begin
+    if not (Sys.file_exists cmifile) then begin
+      raise(Error(Location.in_file mlifile, Interface_not_compiled mlifile))
+    end;
     let dclsig = Env.read_signature modulename cmifile in
     Includemod.compunit "(obtained by packing)" sg mlifile dclsig 
   end else begin

diff --git a/utils/CVS/Entries b/utils/CVS/Entries
new file mode 100644 (file)
index 0000000..b6c2650
--- /dev/null
+++ b/utils/CVS/Entries
@@ -0,0 +1,17 @@
+/.cvsignore/1.1/Tue Aug 29 08:33:37 1995//Tocaml3083
+/ccomp.ml/1.17.2.1/Wed Feb  2 15:39:40 2005//Tocaml3083
+/ccomp.mli/1.9/Thu Apr 18 07:27:47 2002//Tocaml3083
+/clflags.ml/1.46/Thu Jul 17 08:38:28 2003//Tocaml3083
+/config.mli/1.33/Thu Jul  3 15:13:23 2003//Tocaml3083
+/config.mlp/1.196/Sat Jun 12 08:55:49 2004//Tocaml3083
+/consistbl.ml/1.2/Mon Nov 18 10:41:26 2002//Tocaml3083
+/consistbl.mli/1.2/Mon Nov 18 10:41:26 2002//Tocaml3083
+/misc.ml/1.33.2.1/Wed Jul  7 16:47:27 2004//Tocaml3083
+/misc.mli/1.24.6.1/Wed Jul  7 16:47:27 2004//Tocaml3083
+/tbl.ml/1.12/Fri Apr 21 08:13:21 2000//Tocaml3083
+/tbl.mli/1.7/Fri Apr 21 08:13:22 2000//Tocaml3083
+/terminfo.ml/1.6/Thu Jan  1 16:42:42 2004//Tocaml3083
+/terminfo.mli/1.7/Thu Jan  1 16:42:43 2004//Tocaml3083
+/warnings.ml/1.17.4.1/Tue Feb 22 14:30:32 2005//Tocaml3083
+/warnings.mli/1.13/Fri May  2 08:46:06 2003//Tocaml3083
+D

diff --git a/utils/CVS/Repository b/utils/CVS/Repository
new file mode 100644 (file)
index 0000000..459b4c0
--- /dev/null
+++ b/utils/CVS/Repository
@@ -0,0 +1 @@
+csl/utils

diff --git a/utils/CVS/Root b/utils/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/utils/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/utils/CVS/Tag b/utils/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/utils/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/utils/ccomp.ml b/utils/ccomp.ml
index 1a6801c14ce982ed09876306398fda575e1cd0fa..66c4b20ba81b417091f3558d5607363e29cfd569 100644 (file)
--- a/utils/ccomp.ml
+++ b/utils/ccomp.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ccomp.ml,v 1.17 2004/06/16 16:58:46 doligez Exp $ *)
+(* $Id: ccomp.ml,v 1.17.2.1 2005/02/02 15:39:40 xleroy Exp $ *)
 
 (* Compiling C files and building C libraries *)
 
@@ -76,7 +76,7 @@ let create_archive archive file_list =
   let quoted_archive = Filename.quote archive in
   match Config.ccomp_type with
     "msvc" ->
-      command(Printf.sprintf "lib /nologo /debugtype:cv /out:%s %s"
+      command(Printf.sprintf "link /lib /nologo /debugtype:cv /out:%s %s"
                              quoted_archive (quote_files file_list))
   | _ ->
       let r1 =

diff --git a/utils/warnings.ml b/utils/warnings.ml
index ec8bdb281d181cff3bee0024465de841f1c47381..473f94fac12cab3e8b6fdb7c689ed168e90f2ded 100644 (file)
--- a/utils/warnings.ml
+++ b/utils/warnings.ml
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: warnings.ml,v 1.17 2003/05/02 12:52:11 weis Exp $ *)
+(* $Id: warnings.ml,v 1.17.4.1 2005/02/22 14:30:32 doligez Exp $ *)
 
 (* Please keep them in alphabetical order *)
 
@@ -32,7 +32,7 @@ type t =                             (* A is all *)
 let letter = function        (* 'a' is all *)
   | Comment _ ->                'c'
   | Deprecated ->               'd'
-  | Fragile_pat _ ->              'e'
+  | Fragile_pat _ ->            'e'
   | Partial_application ->      'f'
   | Labels_omitted ->           'l'
   | Method_override _ ->        'm'
@@ -43,20 +43,16 @@ let letter = function        (* 'a' is all *)
   | Other _ ->                  'x'
 ;;
 
-let check c =
-  try ignore (String.index "acdeflmpsuvxACDEFLMPSUVX" c)
-  with _ -> raise (Arg.Bad (Printf.sprintf "unknown warning option %c" c))
-;;    
-
-let active = Array.create 26 true;;
-let error = Array.create 26 false;;
+let active = Array.create 27 true;;
+let error = Array.create 27 false;;
 
 let translate c =
-  check c;
   if c >= 'A' && c <= 'Z' then
     (Char.code c - Char.code 'A', true)
-  else
+  else if c >= 'a' && c <= 'z' then
     (Char.code c - Char.code 'a', false)
+  else
+    (26, false)
 ;;
 
 let is_active x =

diff --git a/win32caml/CVS/Entries b/win32caml/CVS/Entries
new file mode 100644 (file)
index 0000000..f730440
--- /dev/null
+++ b/win32caml/CVS/Entries
@@ -0,0 +1,15 @@
+/Makefile/1.9/Thu Jun 17 07:33:44 2004//Tocaml3083
+/editbuffer.c/1.1.2.2/Tue Jul  6 15:16:04 2004//Tocaml3083
+/editbuffer.h/1.1.2.2/Tue Jul  6 15:16:04 2004//Tocaml3083
+/history.c/1.1.2.2/Tue Jul  6 15:16:04 2004//Tocaml3083
+/history.h/1.1.2.2/Tue Jul  6 15:16:04 2004//Tocaml3083
+/inria.h/1.5/Thu Jun 17 07:33:44 2004//Tocaml3083
+/inriares.h/1.3/Tue Jul 23 14:12:02 2002//Tocaml3083
+/libgraph.h/1.3/Tue Jul 23 14:12:02 2002//Tocaml3083
+/menu.c/1.7/Thu Jun 17 07:33:44 2004//Tocaml3083
+/ocaml.c/1.7.2.1/Mon Aug  9 08:51:09 2004//Tocaml3083
+/ocaml.ico/1.1/Tue Nov  6 12:36:23 2001//Tocaml3083
+/ocaml.rc/1.4/Thu Jun 17 07:33:45 2004//Tocaml3083
+/resource.h/1.1.2.1/Mon Jun 21 14:42:20 2004//Tocaml3083
+/startocaml.c/1.9.2.2/Wed Feb  2 15:41:30 2005//Tocaml3083
+D

diff --git a/win32caml/CVS/Repository b/win32caml/CVS/Repository
new file mode 100644 (file)
index 0000000..c9744f0
--- /dev/null
+++ b/win32caml/CVS/Repository
@@ -0,0 +1 @@
+csl/win32caml

diff --git a/win32caml/CVS/Root b/win32caml/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/win32caml/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/win32caml/CVS/Tag b/win32caml/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/win32caml/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083

diff --git a/win32caml/startocaml.c b/win32caml/startocaml.c
index 06d7a90ff4fdd8c9a52ee9a24ef1833d763c83ce..fda28274dda78707c2d1047c790c5a3fb57b5deb 100644 (file)
--- a/win32caml/startocaml.c
+++ b/win32caml/startocaml.c
@@ -15,7 +15,7 @@
 /* Began 14 Sept 2003 - watford@uiuc.edu                               */
 /***********************************************************************/
 
-/* $Id: startocaml.c,v 1.9.2.1 2004/07/06 15:16:04 xleroy Exp $ */
+/* $Id: startocaml.c,v 1.9.2.2 2005/02/02 15:41:30 xleroy Exp $ */
 
 #include <windows.h>
 #include <stdio.h>
@@ -138,50 +138,40 @@ Errors:        Almost all system calls will be verified
 ------------------------------------------------------------------------*/
 int GetOcamlPath(void)
 {
-       char path[1024], *p;
-
-again:
-       if (! ReadRegistry(HKEY_CURRENT_USER,
-               "Software", "Objective Caml",
-               "InterpreterPath", path)
-               &&
-               ! ReadRegistry(HKEY_LOCAL_MACHINE,
-               "Software", "Objective Caml",
-               "InterpreterPath", path)) {
-                       /* Key doesn't exist?  Ask user */
-                       if (!BrowseForFile("Ocaml interpreter|ocaml.exe", path)) {
-                               ShowDbgMsg("Impossible to find ocaml.exe. I quit");
-                               exit(0);
-                       }
-                       WriteRegistry(HKEY_CURRENT_USER,
-                               "Software", "Objective Caml",
-                               "InterpreterPath", path);
-               }
-               /* Check if file exists */
-               if (_access(path, 0) != 0) {
-                       char *errormsg = malloc(1024);
-                       wsprintf(errormsg,"Incorrect path for ocaml.exe:\n%s", path);
-                       ShowDbgMsg(errormsg);
-                       free(errormsg);
-                       path[0] = 0;
-                       WriteRegistry(HKEY_CURRENT_USER,
-                               "Software", "Objective Caml",
-                               "InterpreterPath", path);
-                       goto again;
-               }
-               strcpy(OcamlPath, path);
-               p = strrchr(OcamlPath,'\\');
-               if (p) {
-                       *p = 0;
-                       strcpy(LibDir,OcamlPath);
-                       *p = '\\';
-                       p = strrchr(LibDir,'\\');
-                       if (p && !stricmp(p,"\\bin")) {
-                               *p = 0;
-                               strcat(LibDir,"\\lib");
-                       }
-               }
-               return 1;
+  char path[1024], *p;
+
+  while (( !ReadRegistry(HKEY_CURRENT_USER,
+                        "Software", "Objective Caml",
+                        "InterpreterPath", path)
+          &&
+          !ReadRegistry(HKEY_LOCAL_MACHINE,
+                        "Software", "Objective Caml",
+                        "InterpreterPath", path))
+        || _access(path, 0) != 0) {
+    /* Registry key doesn't exist or contains invalid path */
+    /* Ask user */
+    if (!BrowseForFile("Ocaml interpreter|ocaml.exe", path)) {
+      ShowDbgMsg("Impossible to find ocaml.exe. I quit");
+      exit(0);
+    }
+    WriteRegistry(HKEY_CURRENT_USER,
+                 "Software", "Objective Caml",
+                 "InterpreterPath", path);
+    /* Iterate to validate again */
+  }
+  strcpy(OcamlPath, path);
+  p = strrchr(OcamlPath,'\\');
+  if (p) {
+    *p = 0;
+    strcpy(LibDir,OcamlPath);
+    *p = '\\';
+    p = strrchr(LibDir,'\\');
+    if (p && !stricmp(p,"\\bin")) {
+      *p = 0;
+      strcat(LibDir,"\\lib");
+    }
+  }
+  return 1;
 }
 
 static HANDLE hChildStdinRd, hChildStdinWr,hChildStdoutRd, hChildStdoutWr;

diff --git a/yacc/CVS/Entries b/yacc/CVS/Entries
new file mode 100644 (file)
index 0000000..e03aa85
--- /dev/null
+++ b/yacc/CVS/Entries
@@ -0,0 +1,17 @@
+/.cvsignore/1.6/Fri Apr  7 16:15:34 2000//Tocaml3083
+/Makefile/1.8/Thu Aug 10 09:58:08 2000//Tocaml3083
+/Makefile.nt/1.4/Fri Jun  7 09:49:45 2002//Tocaml3083
+/closure.c/1.9/Thu Jul 12 12:54:22 2001//Tocaml3083
+/defs.h/1.22/Wed Apr 21 23:26:05 2004//Tocaml3083
+/error.c/1.13/Sat Jun 12 11:59:11 2004//Tocaml3083
+/lalr.c/1.8/Thu Jul 12 12:54:23 2001//Tocaml3083
+/lr0.c/1.8/Thu Jul 12 12:54:23 2001//Tocaml3083
+/main.c/1.18/Wed Apr 21 23:26:05 2004//Tocaml3083
+/mkpar.c/1.11/Thu Jul 12 12:54:23 2001//Tocaml3083
+/output.c/1.14/Sat Nov  2 22:36:46 2002//Tocaml3083
+/reader.c/1.28.2.1/Fri Aug 20 15:26:02 2004//Tocaml3083
+/skeleton.c/1.12/Sat Nov  2 22:36:46 2002//Tocaml3083
+/symtab.c/1.8/Thu Jul 12 12:54:23 2001//Tocaml3083
+/verbose.c/1.9/Thu Jul 12 12:54:23 2001//Tocaml3083
+/warshall.c/1.8/Thu Jul 12 12:54:23 2001//Tocaml3083
+D

diff --git a/yacc/CVS/Repository b/yacc/CVS/Repository
new file mode 100644 (file)
index 0000000..29560fb
--- /dev/null
+++ b/yacc/CVS/Repository
@@ -0,0 +1 @@
+csl/yacc

diff --git a/yacc/CVS/Root b/yacc/CVS/Root
new file mode 100644 (file)
index 0000000..c83f52f
--- /dev/null
+++ b/yacc/CVS/Root
@@ -0,0 +1 @@
+:ext:yquem.inria.fr:/net/yquem/devel/caml/repository

diff --git a/yacc/CVS/Tag b/yacc/CVS/Tag
new file mode 100644 (file)
index 0000000..deaa3ee
--- /dev/null
+++ b/yacc/CVS/Tag
@@ -0,0 +1 @@
+Nocaml3083