Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accept and ignore '+' and '-' before precision integers 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14830 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Gabriel Scherer 2014-05-12 15:38:14 +00:00
parent 8f7b47a137
commit 11fdab809d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stdlib/camlinternalFormat.ml
View File

@ -1421,11 +1421,22 @@ let fmt_ebb_of_string str =
(_, _, e, f) fmt_ebb =
fun pct_ind str_ind end_ind plus sharp space ign pad ->
if str_ind = end_ind then unexpected_end_of_format end_ind;
match str.[str_ind] with
| '0' .. '9' ->
let parse_literal str_ind =
let new_ind, prec = parse_positive str_ind end_ind 0 in
parse_conversion pct_ind (new_ind + 1) end_ind plus sharp space ign pad
(Lit_precision prec) str.[new_ind]
(Lit_precision prec) str.[new_ind] in
match str.[str_ind] with
| '0' .. '9' -> parse_literal str_ind
| ('+' | '-') when legacy_behavior ->
(* Legacy mode would accept and ignore '+' or '-' before the
integer describing the desired precision; not that this
cannot happen for padding width, as '+' and '-' already have
a semantics there.
That said, the idea (supported by this tweak) that width and
precision literals are "integer literals" in the OCaml sense is
still blatantly wrong, as 123_456 or 0xFF are rejected. *)
parse_literal (str_ind + 1)
| '*' ->
parse_after_precision pct_ind (str_ind + 1) end_ind plus sharp space ign
pad Arg_precision

2
stdlib/pervasives.ml
View File

@ -562,7 +562,7 @@ type prec_option = int option
(* Type used in Format_subst_ty and Format_subst constructors as "a proof"
of '->' number equality between two ('d, 'e) relations. *)
(* See the scanf implementation of "%(...%)". *)
(* Not meaningfull for Printf and Format since "%r" is Scanf specific. *)
(* Not meaningful for Printf and Format since "%r" is Scanf specific. *)
type ('d1, 'e1, 'd2, 'e2) reader_nb_unifier =
| Zero_reader :
('d1, 'd1, 'd2, 'd2) reader_nb_unifier