Commit Graph

111 Commits (b40c186bfc3bb3f3099ea146618a6b674d50a47c)

Author SHA1 Message Date
Pierre Weis 8604fbe7f3 A bit of documentation to explain the behaviour of stdib and more generally the
lookahead behaviour of scanning buffers.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7377 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-05 15:41:42 +00:00
Pierre Weis 176b3c0da8 Module Sformat is internal to printf. Better typing specifications of functions working with format strings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7374 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-04-05 11:49:07 +00:00
Pierre Weis dc068cdbe1 Sscanf_format gets a type consistent with the type of sscanf.
Adding a function scan_format that scan a string to directely return a format4
value.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7324 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-12 10:18:18 +00:00
Pierre Weis b970e68b67 New and better wording for scanf_format functions.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7298 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-01-03 18:25:21 +00:00
Pierre Weis a3b605a2db New function sscanf_format to read a format from a string.
The type of the resulting format is dynamically checked and should be
the type of the template format which is the second argument.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7061 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-09-20 21:42:44 +00:00
Pierre Weis 564969e68c Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7049 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-09-13 15:44:02 +00:00
Pierre Weis 026ff6d482 Better documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7048 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-09-13 11:26:06 +00:00
Pierre Weis d21474e7b3 Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6965 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2005-07-11 14:49:57 +00:00
Pierre Weis 1676f61cd6 Documenting the [%s] behaviour on end-of-input and stating that it
never fails.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6678 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-16 10:27:28 +00:00
Maxence Guesdon 6088ac221a fix comment
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6658 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-03 08:54:15 +00:00
Damien Doligez 06703fdc45 typo dans un commentaire
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6652 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-11-02 10:41:43 +00:00
Pierre Weis b5c447dba6 Exporting the name_of_input function to get the name of the input
buffer's character source.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6629 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-10-05 06:54:45 +00:00
Pierre Weis af5c49f878 Typo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6623 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-09-29 09:57:30 +00:00
Pierre Weis b0270c4cf9 Implementation des meta formats.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6621 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-09-22 09:17:21 +00:00
Pierre Weis 695fe90650 Wrong example in character ranges specification.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-09-09 07:54:50 +00:00
Damien Doligez a4111b65e5 PR#2799
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6452 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-06-24 11:19:05 +00:00
Maxence Guesdon 90f3ac484a ajout cross ref dans un commentaire
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6166 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-03-22 15:59:22 +00:00
Maxence Guesdon 27181b4db2 associate comment to fscanf correctly (there was a blank line preventing the comment to be associated to the function)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6161 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-03-22 14:38:01 +00:00
Pierre Weis 177a7a8ce0 Format %F shoudl to be documented on its own.
More documentation and some code rewriting in Scanf.ml; push the
special case for ranges of length 3 to make_setp.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6108 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-02-04 10:16:25 +00:00
Pierre Weis 819496a447 Main function has been simplified.
Bug corrected in (negative) range scanning.
Line numbers are counted for you in next_char.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5984 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-11-30 22:13:03 +00:00
Pierre Weis 5320c8fce6 Documentation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5872 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-16 16:25:25 +00:00
Basile Starynkevitch b3a4e2e07a typo
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5869 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-15 07:34:23 +00:00
Basile Starynkevitch 8aa1184310 added explanation about scanning indications.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5868 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-10-15 07:28:56 +00:00
Pierre Weis fab3b6b071 More documentation about fscanf (due to private bug report from
Roberto). An unused function is suppressed. The Objective Caml `_'
convention for numbers is used and documented.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5690 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-15 07:25:09 +00:00
Pierre Weis 9cad9931a1 Suite au PR#1745 %F lit un flottant au format token Caml.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5685 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-14 10:04:25 +00:00
Pierre Weis 139cf32a6f Width field of %c conversion is dynamically checked and must be 0 or 1.
The function end_of_input was wrong in case of a buffer for which both
beginning_of_input and end_of_input conditions were true (e.g. in case
of an empty string or an empty file).

Better error reporting for characters out of the given range.

Reminiscent of the printf semantics, %! matches the end of input
condition.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5662 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-07 11:13:21 +00:00
Xavier Leroy 1a4be860d0 Renommage type format -> format4 et reintroduction type format a 3 arguments pour compatibilite arriere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5658 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-05 11:13:24 +00:00
Damien Doligez b37e53cef1 PR#1675, voir aussi PR#1438
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5641 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-07-01 16:30:12 +00:00
Pierre Weis 3b1652c76c Explicit documentation of %0c: scanf "%0c" (fun c -> ...) gives access
to the current character without reading it. This is convenient to
continue scanning according to the value of the current character,
without having the burden to add it to the scanning result (if only
possible when you decide to scan %C or %S when c is " or ').


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5562 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-14 06:39:50 +00:00
Pierre Weis f1217b8bc7 Begin_of_input -> beginning_of_input.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5561 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-05-14 06:30:04 +00:00
Pierre Weis e3c25d1b24 Correcting the bug of large buffering when scanning files.
Introduction of two new functions Scanning.from_file and
Scanning.from_file_bin to alleviate this problem.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5506 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-04-25 10:21:21 +00:00
Pierre Weis 1f955eb17e Format %S now understands continuation newlines (\\\n).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5412 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-03-02 23:03:15 +00:00
Pierre Weis 8701ef7048 Documentation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5322 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-09 10:28:05 +00:00
Pierre Weis 9deb0370fa Exporting stdib
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5315 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-08 15:16:09 +00:00
Pierre Weis 9fd8825b8d adding C-like %n format for scanf. For printf %n is an alias fr %i.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5313 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-08 13:52:02 +00:00
Pierre Weis 12107f3fbe Reaching the format graal: the fourth element
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-31 09:56:11 +00:00
Pierre Weis 03625b7620 Export de end_of_input.
Implementation de la semantique des espaces conforme a la doc (seul le
caractère 32 est reconnu pour appeler skip_spaces).


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5207 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-30 23:46:21 +00:00
Pierre Weis e42e2b9266 Revised semantics of @c: the c character is now skipped by default.
This behaviour is documented.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5162 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-08 06:46:15 +00:00
Pierre Weis 739479921d Provision for unsigned numbers in binary notation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5159 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-10-07 12:16:03 +00:00
Pierre Weis a96f8f0e87 Formats %B and %F.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5119 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-09-05 10:38:11 +00:00
Pierre Weis 05406fd635 Typos.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5053 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-28 21:51:51 +00:00
Pierre Weis 6c15753d0f Revu le traitement de %S (les @c ne sont pas nécessaires vus les
guillemets délimiteurs).
Revu le traitement des blancs en fin de fichier et les formats à
indication de scanning erronées (format terminé par @).
Revu le type de kscanf.
Revu la documentation des indications de scanning.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5051 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-28 21:29:42 +00:00
Xavier Leroy 6970e8c7fa Identifier %x et %X; bug parsing entiers octal et hexa (PR#1260); 8 n'est pas un chiffre octal. Signe: Damien & Xavier
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5041 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-25 15:24:58 +00:00
Xavier Leroy 1c2eda75a7 ocamldoc n'aime pas [@c] ...
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5039 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-25 14:06:19 +00:00
Xavier Leroy 2864c78b57 Petites modifs dans les commentaires de doc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5037 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-25 12:17:35 +00:00
Xavier Leroy 12e24290b8 Petites modifs dans les commentaires de doc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5036 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-25 12:11:29 +00:00
Pierre Weis 4865d98f29 Errors in documentation + the error continuation now takes as argument
the exception that was raised during scanning instead of a string
explaining the problem + proper end of file detection.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-11 22:39:26 +00:00
Pierre Weis d7e240f4d9 Documentation of kscanf + simplification of exception Scan_failure.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4957 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-27 09:18:11 +00:00
Pierre Weis 72d45abf8a Introducing kscanf, the scanning function that has an extra
continuation argument for scanning failures.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4949 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-26 09:31:02 +00:00
Pierre Weis 0505570e3b Introducing a specific exception for formatted input functions.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4922 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-12 08:31:21 +00:00
Pierre Weis b34615a023 Spelling.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4900 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-07 10:05:52 +00:00
Pierre Weis 12b5faed10 Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4856 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-28 17:51:49 +00:00
Pierre Weis 2b74c8d0bd Le module Scanning est intégré dans Scanf.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4849 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-27 22:00:09 +00:00
Pierre Weis ad7659f31d Les formats [f], [e], [E], [g], [G] sont équivalents.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4848 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-27 20:41:19 +00:00
Pierre Weis 60ed746eef Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4840 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-27 07:05:36 +00:00
Pierre Weis 3e2024a34c typos
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4829 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-20 19:22:21 +00:00
Pierre Weis a08d0285f1 Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4825 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-17 08:17:52 +00:00
Pierre Weis f2881ac3d2 Typos.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4810 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-15 20:28:57 +00:00
Pierre Weis 3652bd03d9 Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4805 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-12 18:40:15 +00:00
Pierre Weis d4fefff6fa Documentation.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4795 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-08 13:51:09 +00:00
Pierre Weis 01ca2d9ec2 Introducing a ``scanf'' facility in Objective Caml.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4780 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-05-07 07:41:12 +00:00