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

Correcting bug concerning incomplete (meta)-format strings. 

More regular error functions (coherence with printf).


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6724 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Pierre Weis 2004-12-07 06:13:06 +00:00
parent 1179789c0c
commit b774951705
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
typing/typecore.ml
View File

@ -633,11 +633,10 @@ let type_format loc fmt =
let rec type_in_format fmt =
let len = String.length fmt in
let bad_format i len =
raise (Error (loc, Bad_format (String.sub fmt i len))) in
let bad_conversion i len =
let bad_conversion fmt i c =
raise (Error (loc, Bad_conversion (fmt, String.sub fmt i len))) in
let incomplete i = bad_format i (len - i) in
let incomplete i =
raise (Error (loc, Bad_format (String.sub fmt i (len - i)))) in
let ty_input = newvar ()
and ty_result = newvar ()
@ -719,14 +718,16 @@ let type_format loc fmt =
| '{' | '(' as c ->
let j = j + 1 in
if j >= len then incomplete i else
let sj = Printf.sub_format c fmt j in
let sj =
Printf.sub_format
(fun fmt -> incomplete 0) bad_conversion c fmt j in
let sfmt = String.sub fmt j (sj - j - 1) in
let ty_sfmt = type_in_format sfmt in
begin match c with
| '{' -> conversion sj ty_sfmt
| _ -> incr meta; conversion (j - 1) ty_sfmt end
| ')' when !meta > 0 -> decr meta; scan_format (j + 1)
| c -> bad_conversion i (j - i + 1) in
| c -> bad_conversion fmt i c in
scan_flags i j in
let ty_ares, ty_res = scan_format 0 in