diff options
author | Pierre Weis <Pierre.Weis@inria.fr> | 2006-10-24 21:16:10 +0000 |
---|---|---|
committer | Pierre Weis <Pierre.Weis@inria.fr> | 2006-10-24 21:16:10 +0000 |
commit | ba75b851b496baefd296d427202414b657cb746b (patch) | |
tree | 108d7d7ea3b6a61805f6266cb4a57ad4af03282a | |
parent | fa5b7ef1474b097672b1bc9b775af0dde3d5f01f (diff) |
Format string now typecheck to format6.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7704 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rwxr-xr-x | boot/ocamlc | bin | 1012543 -> 1012543 bytes | |||
-rwxr-xr-x | boot/ocamllex | bin | 160709 -> 160709 bytes | |||
-rw-r--r-- | typing/typecore.ml | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/boot/ocamlc b/boot/ocamlc Binary files differindex f869b733b..e1d7d517e 100755 --- a/boot/ocamlc +++ b/boot/ocamlc diff --git a/boot/ocamllex b/boot/ocamllex Binary files differindex 3e218aa0c..1c63b48e2 100755 --- a/boot/ocamllex +++ b/boot/ocamllex diff --git a/typing/typecore.ml b/typing/typecore.ml index 2cb686422..4dca550c8 100644 --- a/typing/typecore.ml +++ b/typing/typecore.ml @@ -753,9 +753,9 @@ let type_format loc fmt = if j >= len then incomplete_format fmt else let sj = Printf.sub_format - (fun fmt -> incomplete_format (format_to_string (Obj.magic fmt))) - (fun fmt -> bad_conversion (format_to_string (Obj.magic fmt))) - c (Obj.magic (string_to_format fmt)) j in + (fun fmt -> incomplete_format (format_to_string fmt)) + (fun fmt -> bad_conversion (format_to_string fmt)) + c (string_to_format fmt) j in let sfmt = String.sub fmt j (sj - 2 - j) in let ty_sfmt = type_in_format sfmt in begin match c with |