summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Weis <Pierre.Weis@inria.fr>2013-04-23 21:44:30 +0000
committerPierre Weis <Pierre.Weis@inria.fr>2013-04-23 21:44:30 +0000
commit1d1d751326b022f72be552e51ca825e0c667e1ec (patch)
tree7b1a04f4f933bda21f2de603c29432c0debb88d6
parent976cb4a2f473cfe7f9e1087fe8e2b96912c6b835 (diff)
PR#5973 (old @ escape was still implemented in Format) + bootstrap.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13601 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rwxr-xr-xboot/ocamlcbin1367847 -> 1368125 bytes
-rwxr-xr-xboot/ocamldepbin337827 -> 337693 bytes
-rwxr-xr-xboot/ocamllexbin176016 -> 176004 bytes
-rw-r--r--stdlib/format.ml3
4 files changed, 0 insertions, 3 deletions
diff --git a/boot/ocamlc b/boot/ocamlc
index a6b8fa2a4..61882952d 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
Binary files differ
diff --git a/boot/ocamldep b/boot/ocamldep
index c580409ae..0786f8f4c 100755
--- a/boot/ocamldep
+++ b/boot/ocamldep
Binary files differ
diff --git a/boot/ocamllex b/boot/ocamllex
index 6e542679a..da3c14ea9 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
Binary files differ
diff --git a/stdlib/format.ml b/stdlib/format.ml
index 9fa4785e0..e56955c2c 100644
--- a/stdlib/format.ml
+++ b/stdlib/format.ml
@@ -1179,9 +1179,6 @@ let mkprintf to_s get_out =
print_as := Some size;
doprn n (skip_gt i) in
get_int n (succ i) got_size
- | '@' | '%' as c ->
- pp_print_as_char c;
- doprn n (succ i)
| _ -> invalid_format fmt i
end
| c ->