summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Weis <Pierre.Weis@inria.fr>2010-05-05 17:49:19 +0000
committerPierre Weis <Pierre.Weis@inria.fr>2010-05-05 17:49:19 +0000
commit2855154d6c3fa5774309f31120418610cdf8fdd8 (patch)
treebad0e4c65a0d98c36fd918400fd7c97c94b1fe28
parente9d9d32b7d9325496b79a0fa9d009358663853c3 (diff)
downloadocaml-2855154d6c3fa5774309f31120418610cdf8fdd8.tar.gz
Typo in module Scanf prevented tests to succeeded properly.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10377 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--VERSION2
-rwxr-xr-xboot/ocamlcbin1085814 -> 1088446 bytes
-rwxr-xr-xboot/ocamldepbin303725 -> 305956 bytes
-rwxr-xr-xboot/ocamllexbin165849 -> 165849 bytes
-rw-r--r--stdlib/scanf.ml2
5 files changed, 2 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 1e965d4fe8..8af45b1940 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-3.12.0+dev21 (2010-05-04)
+3.12.0+dev22 (2010-05-05)
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli
diff --git a/boot/ocamlc b/boot/ocamlc
index 987a85e0b3..883b72d614 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
Binary files differ
diff --git a/boot/ocamldep b/boot/ocamldep
index d5597d8dd6..a61a315d02 100755
--- a/boot/ocamldep
+++ b/boot/ocamldep
Binary files differ
diff --git a/boot/ocamllex b/boot/ocamllex
index 48d67fa03d..0b785adf08 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
Binary files differ
diff --git a/stdlib/scanf.ml b/stdlib/scanf.ml
index fe22ec3254..3d3d16c233 100644
--- a/stdlib/scanf.ml
+++ b/stdlib/scanf.ml
@@ -1413,7 +1413,7 @@ let scan_format ib ef fmt rv f =
match Sformat.get fmt i with
(* This is in fact an integer conversion (e.g. %ld, %ni, or %Lo). *)
| 'd' | 'i' | 'o' | 'u' | 'x' | 'X' as conv1 ->
- let _x = scan_int_conv conv1 max ib in
+ let _x = scan_int_conv conv1 max min ib in
(* Look back to the character that triggered the integer conversion
(this character is either 'l', 'n' or 'L') to find the
conversion to apply to the integer token read. *)