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

Simplifying scanning of integers. 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4789 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Pierre Weis 2002-05-07 16:31:33 +00:00
parent 4912200a02
commit 8f79254242
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
stdlib/scanf.ml
View File

@ -355,24 +355,9 @@ let scanf_fun ib (fmt : ('a, 'b, 'c) format) f =
| '%' as fc when Scanning.peek_char ib = fc -> | '%' as fc when Scanning.peek_char ib = fc ->
Scanning.next_char ib; scan f (i + 1) Scanning.next_char ib; scan f (i + 1)
| '%' as fc -> bad_format fmt i fc | '%' as fc -> bad_format fmt i fc
| 'd' -> | 'd' | 'i' | 'o' | 'u' | 'x' | 'X' ->
let x = read_optionally_signed_decimal_int max ib in let x = scan_int c max ib in
scan (Obj.magic f x) (i + 1) scan (Obj.magic f (token_int ib)) (i + 1)
| 'i' ->
let x = read_optionally_signed_int max ib in
scan (Obj.magic f x) (i + 1)
| 'o' ->
let x = read_unsigned_octal_int max ib in
scan (Obj.magic f x) (i + 1)
| 'u' ->
let x = read_unsigned_decimal_int max ib in
scan (Obj.magic f x) (i + 1)
| 'x' ->
let x = read_unsigned_hexadecimal_int max ib in
scan (Obj.magic f x) (i + 1)
| 'X' ->
let x = read_unsigned_Hexadecimal_int max ib in
scan (Obj.magic f x) (i + 1)
| 'f' | 'g' | 'G' | 'e' | 'E' -> | 'f' | 'g' | 'G' | 'e' | 'E' ->
let x = read_float max ib in scan (Obj.magic f x) (i + 1) let x = read_float max ib in scan (Obj.magic f x) (i + 1)
| 's' -> let x = read_string max ib in scan (Obj.magic f x) (i + 1) | 's' -> let x = read_string max ib in scan (Obj.magic f x) (i + 1)