summaryrefslogtreecommitdiff
path: root/stdlib/scanf.mli
diff options
context:
space:
mode:
authorPierre Weis <Pierre.Weis@inria.fr>2011-02-23 18:39:15 +0000
committerPierre Weis <Pierre.Weis@inria.fr>2011-02-23 18:39:15 +0000
commit0d2a1430d0eb215fb13860c111cc5bd1948854a9 (patch)
tree5c3b54d405531b016e55c8ffdee590ce6352da9e /stdlib/scanf.mli
parent480c99722b11ef5c0355eb17e806c2be26daa4d1 (diff)
downloadocaml-0d2a1430d0eb215fb13860c111cc5bd1948854a9.tar.gz
Defining type file_name.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10963 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib/scanf.mli')
-rw-r--r--stdlib/scanf.mli13
1 files changed, 7 insertions, 6 deletions
diff --git a/stdlib/scanf.mli b/stdlib/scanf.mli
index 620b731918..c595f1d0c7 100644
--- a/stdlib/scanf.mli
+++ b/stdlib/scanf.mli
@@ -103,7 +103,8 @@ type scanbuf = in_channel;;
val stdin : in_channel;;
(** The standard input notion for the [Scanf] module.
- [Scanning.stdin] is the formatted input channel attached to [Pervasives.stdin].
+ [Scanning.stdin] is the formatted input channel attached to
+ [Pervasives.stdin].
Note: in the interactive system, when input is read from [stdin], the
newline character that triggers the evaluation is incorporated in the
@@ -272,11 +273,11 @@ val bscanf : Scanning.in_channel -> ('a, 'b, 'c, 'd) scanner;;
- [x] or [X]: reads an unsigned hexadecimal integer ([[0-9a-f]+] or [[0-9A-F]+]).
- [o]: reads an unsigned octal integer ([[0-7]+]).
- [s]: reads a string argument that spreads as much as possible, until the
- following bounding condition holds:
- - a whitespace has been found (see {!Scanf.space}),
- - a scanning indication (see scanning {!Scanf.indication}) has been
- encountered,
- - the end-of-input has been reached.
+ following bounding condition holds: {ul
+ {- a whitespace has been found (see {!Scanf.space}),}
+ {- a scanning indication (see scanning {!Scanf.indication}) has been
+ encountered,}
+ {- the end-of-input has been reached.}}
Hence, this conversion always succeeds: it returns an empty
string, if the bounding condition holds when the scan begins.
- [S]: reads a delimited string argument (delimiters and special