aboutsummaryrefslogtreecommitdiff
path: root/dev/doc/patch.ocaml-3.10.drop.rectypes
diff options
context:
space:
mode:
authorvsiles2009-04-14 14:00:09 +0000
committervsiles2009-04-14 14:00:09 +0000
commit3b10ec5609f26314ede83ccd9ed688c7d07ce7c3 (patch)
tree6dce0dc517dc1f77a73e8d0fc46b9665b9b14c03 /dev/doc/patch.ocaml-3.10.drop.rectypes
parentad85ebc0b940d6f4d6996c9a7297555c2c8e7567 (diff)
Correction du patch -rectypes pour ocaml 3.10
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12085 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'dev/doc/patch.ocaml-3.10.drop.rectypes')
-rw-r--r--dev/doc/patch.ocaml-3.10.drop.rectypes12
1 files changed, 7 insertions, 5 deletions
diff --git a/dev/doc/patch.ocaml-3.10.drop.rectypes b/dev/doc/patch.ocaml-3.10.drop.rectypes
index fd804b728c..ba7a3e9504 100644
--- a/dev/doc/patch.ocaml-3.10.drop.rectypes
+++ b/dev/doc/patch.ocaml-3.10.drop.rectypes
@@ -1,14 +1,14 @@
Index: scripts/coqmktop.ml
===================================================================
---- scripts/coqmktop.ml (révision 11904)
+--- scripts/coqmktop.ml (révision 12084)
+++ scripts/coqmktop.ml (copie de travail)
-@@ -235,11 +235,23 @@
+@@ -231,12 +231,25 @@
end;;
let ppf = Format.std_formatter;;
+ let set_rectypes_hack () =
+ if String.length (Sys.ocaml_version) >= 4 &
-+ String.sub (Sys.ocaml_version) 0 4 = \"3.11\"
++ String.sub (Sys.ocaml_version) 0 4 = \"3.10\"
+ then
+ (* ocaml 3.10 does not have #rectypes but needs it *)
+ (* simulate a call with option -rectypes before *)
@@ -18,12 +18,14 @@ Index: scripts/coqmktop.ml
+ done
+ else
+ () in
++
Mltop.set_top
- {Mltop.load_obj=Topdirs.dir_load ppf;
+ {Mltop.load_obj=
+ (fun f -> if not (Topdirs.load_file ppf f) then failwith \"error\");
Mltop.use_file=Topdirs.dir_use ppf;
Mltop.add_dir=Topdirs.dir_directory;
- Mltop.ml_loop=(fun () -> Toploop.loop ppf) };;\n"
-+ Mltop.ml_loop=(fun () -> set_rectypes_hack (); Toploop.loop ppf) };;\n"
++ Mltop.ml_loop=(fun () -> set_rectypes_hack(); Topmain.main()) };;\n"
(* create a temporary main file to link *)
let create_tmp_main_file modules =