mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00
Code Activity

Extend soft ports to use input-waiting thunks.

Browse source
This commit is contained in:
Neil Jerram 2002-10-09 19:07:23 +00:00
parent 6689417748
commit 34010f5694
4 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ice-9/ChangeLog
View file

@ -1,3 +1,8 @@
2002-10-09 Neil Jerram <neil@ossau.uklinux.net>
* buffered-input.scm (make-buffered-input-port): Build an
input-waiting thunk for just extended version of make-soft-port.
2002-10-04 Rob Browning <rlb@defaultvalue.org>
* boot-9.scm (expt): switch if sense and use negative? rather than

7
ice-9/buffered-input.scm
View file

@ -105,8 +105,13 @@ with @var{continuation?} set to @code{#t}."
(if (not (char-whitespace? res))
(set! (buffered-input-continuation? port) #t))
res)))))
(input-waiting
(lambda ()
(if (eof-object? read-string)
1
(- (string-length read-string) string-index))))
(port #f))
(set! port (make-soft-port (vector #f #f #f get-character #f) "r"))
(set! port (make-soft-port (vector #f #f #f get-character #f input-waiting) "r"))
(set! (buffered-input-continuation? port) #f)
port)))

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
2002-10-09 Neil Jerram <neil@ossau.uklinux.net>
* vports.c (scm_make_soft_port): Allow vector argument to carry a
6th element: an input waiting thunk.
(sf_input_waiting): New.
2002-10-05 Marius Vollmer <mvo@zagadka.ping.de>
* root.c (root_mark): Mark active_asyncs slot.

28
libguile/vports.c
View file

@ -139,12 +139,28 @@ sf_close (SCM port)
}
static int
sf_input_waiting (SCM port)
{
SCM p = SCM_PACK (SCM_STREAM (port));
if (SCM_VECTOR_LENGTH (p) >= 6)
{
SCM f = SCM_VELTS (p)[5];
if (SCM_NFALSEP (f))
return SCM_INUM (scm_call_0 (f));
}
/* Default is such that char-ready? for soft ports returns #t, as it
did before this extension was implemented. */
return 1;
}
SCM_DEFINE (scm_make_soft_port, "make-soft-port", 2, 0, 0,
(SCM pv, SCM modes),
"Return a port capable of receiving or delivering characters as\n"
"specified by the @var{modes} string (@pxref{File Ports,\n"
"open-file}). @var{pv} must be a vector of length 5. Its\n"
"open-file}). @var{pv} must be a vector of length 5 or 6. Its\n"
"components are as follows:\n"
"\n"
"@enumerate 0\n"
@ -158,6 +174,9 @@ SCM_DEFINE (scm_make_soft_port, "make-soft-port", 2, 0, 0,
"thunk for getting one character\n"
"@item\n"
"thunk for closing port (not by garbage collection)\n"
"@item\n"
"(if present and not @code{#f}) thunk for computing the number of\n"
"characters that can be read from the port without blocking.\n"
"@end enumerate\n"
"\n"
"For an output-only port only elements 0, 1, 2, and 4 need be\n"
@ -185,9 +204,13 @@ SCM_DEFINE (scm_make_soft_port, "make-soft-port", 2, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_make_soft_port
{
int vlen;
scm_t_port *pt;
SCM z;
SCM_VALIDATE_VECTOR_LEN (1, pv,5);
SCM_VALIDATE_VECTOR (1, pv);
vlen = SCM_VECTOR_LENGTH (pv);
SCM_ASSERT ((vlen == 5) || (vlen == 6), pv, 1, FUNC_NAME);
SCM_VALIDATE_STRING (2, modes);
SCM_DEFER_INTS;
@ -211,6 +234,7 @@ scm_make_sfptob ()
scm_set_port_mark (tc, scm_markstream);
scm_set_port_flush (tc, sf_flush);
scm_set_port_close (tc, sf_close);
scm_set_port_input_waiting (tc, sf_input_waiting);
return tc;
}