diff options
| author | Alain Frisch <alain@frisch.fr> | 2018-04-30 12:39:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 12:39:12 +0200 |
| commit | 672e615b8152138ac1a921d7bf5a6471dc21d8a4 (patch) | |
| tree | 1399fb5dbe562b995d78e0a83591b84f4c118ef9 /stdlib | |
| parent | bcfa95848bc28a67513b2136e830ae573d238e4b (diff) | |
| parent | 9273bab69e3c2cbd45595797cf231339d92d6fe2 (diff) | |
| download | ocaml-fix_large_file_lseek_windows.tar.gz | |
Merge branch 'trunk' into fix_large_file_lseek_windowsfix_large_file_lseek_windows
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 7 | ||||
| -rw-r--r-- | stdlib/format.ml | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index ef7a8d4ff7..4b044914da 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -87,6 +87,13 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cmx .PHONY: install install:: +# Transitional: when upgrading from 4.06 -> 4.07, module M is in stdlib__m.cm*, +# while previously it was in m.cm*, which confuses the compiler. + rm -f $(patsubst stdlib__%,"$(INSTALL_LIBDIR)/%", $(filter stdlib__%,$(OBJS))) +# Remove "old" pervasives.* and bigarray.* to avoid getting confused with the +# Stdlib versions. + rm -f "$(INSTALL_LIBDIR)/pervasives.*" "$(INSTALL_LIBDIR)/bigarray.*" +# End transitional $(INSTALL_DATA) \ stdlib.cma std_exit.cmo *.cmi *.cmt *.cmti *.mli *.ml camlheader_ur \ "$(INSTALL_LIBDIR)" diff --git a/stdlib/format.ml b/stdlib/format.ml index e02ffae1f2..2769313333 100644 --- a/stdlib/format.ml +++ b/stdlib/format.ml @@ -239,7 +239,7 @@ exception Empty_queue let peek_queue = function | { body = Cons { head = x; tail = _; }; _ } -> x - | { body = Nil; insert = _; } -> raise Empty_queue + | { body = Nil; insert = _; } -> raise_notrace Empty_queue let take_queue = function @@ -247,7 +247,7 @@ let take_queue = function q.body <- tl; if tl = Nil then q.insert <- Nil; (* Maintain the invariant. *) x - | { body = Nil; insert = _; } -> raise Empty_queue + | { body = Nil; insert = _; } -> raise_notrace Empty_queue (* Enter a token in the pretty-printer queue. *) @@ -393,7 +393,7 @@ let format_pp_token state size = function | Pp_tbox tabs :: _ -> let rec find n = function | x :: l -> if x >= n then x else find n l - | [] -> raise Not_found in + | [] -> raise_notrace Not_found in let tab = match !tabs with | x :: _ -> |