diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-02-10 16:15:24 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-02-10 16:15:24 +0000 |
| commit | e7f5b858c2aee1fc6caeefc3d7c80ca696be2897 (patch) | |
| tree | f6e4f76927ce2a4f604fcc0596f1b6505cc39fe3 /stdlib | |
| parent | d7cbf2a01a390f2fe6bedef1292bb5aa55d8b6f7 (diff) | |
More renaming to OCaml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/scanf.mli | 8 | ||||
| -rw-r--r-- | stdlib/string.mli | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/stdlib/scanf.mli b/stdlib/scanf.mli index 05cd86cac..09b6e4640 100644 --- a/stdlib/scanf.mli +++ b/stdlib/scanf.mli @@ -286,18 +286,18 @@ val bscanf : Scanning.in_channel -> ('a, 'b, 'c, 'd) scanner;; 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 - escaped characters follow the lexical conventions of Caml). + escaped characters follow the lexical conventions of OCaml). - [c]: reads a single character. To test the current input character without reading it, specify a null field width, i.e. use specification [%0c]. Raise [Invalid_argument], if the field width specification is greater than 1. - [C]: reads a single delimited character (delimiters and special - escaped characters follow the lexical conventions of Caml). + escaped characters follow the lexical conventions of OCaml). - [f], [e], [E], [g], [G]: reads an optionally signed floating-point number in decimal notation, in the style [dddd.ddd e/E+-dd]. - [F]: reads a floating point number according to the lexical - conventions of Caml (hence the decimal point is mandatory if the + conventions of OCaml (hence the decimal point is mandatory if the exponent part is not mentioned). - [B]: reads a boolean argument ([true] or [false]). - [b]: reads a boolean argument (for backward compatibility; do not use @@ -376,7 +376,7 @@ val bscanf : Scanning.in_channel -> ('a, 'b, 'c, 'd) scanner;; nothing to read in the input: in this case, it simply returns [""]. - in addition to the relevant digits, ['_'] characters may appear - inside numbers (this is reminiscent to the usual Caml lexical + inside numbers (this is reminiscent to the usual OCaml lexical conventions). If stricter scanning is desired, use the range conversion facility instead of the number conversions. diff --git a/stdlib/string.mli b/stdlib/string.mli index efdecea48..8a7367ac3 100644 --- a/stdlib/string.mli +++ b/stdlib/string.mli @@ -27,10 +27,10 @@ substring of [s] if [len >= 0] and [start] and [start+len] are valid positions in [s]. - Caml strings can be modified in place, for instance via the + OCaml strings can be modified in place, for instance via the {!String.set} and {!String.blit} functions described below. This possibility should be used rarely and with much care, however, since - both the Caml compiler and most Caml libraries share strings as if + both the OCaml compiler and most OCaml libraries share strings as if they were immutable, rather than copying them. In particular, string literals are shared: a single copy of the string is created at program loading time and returned by all evaluations of the |