[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 16/18: When making soft port, parse handlers into struct
From: |
Andy Wingo |
Subject: |
[Guile-commits] 16/18: When making soft port, parse handlers into struct |
Date: |
Wed, 06 Apr 2016 17:27:08 +0000 |
wingo pushed a commit to branch wip-port-refactor
in repository guile.
commit c0d5f8b5551cb5857f170f8e1557096874e684c5
Author: Andy Wingo <address@hidden>
Date: Tue Apr 5 14:56:24 2016 +0200
When making soft port, parse handlers into struct
* libguile/vports.c (struct soft_port): New data structure.
(scm_make_soft_port): Unpack vector into struct when making soft
port.
(soft_port_input_waiting, soft_port_close, soft_port_fill_input):
(soft_port_write, soft_port_flush): Adapt. Remove an extraneous
errno=0 in soft_port_close.
---
libguile/vports.c | 59 ++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/libguile/vports.c b/libguile/vports.c
index 03697f0..b46f9f7 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -51,29 +51,35 @@
static scm_t_bits scm_tc16_soft_port;
+struct soft_port {
+ SCM write_char;
+ SCM write_string;
+ SCM flush;
+ SCM read_char;
+ SCM close;
+ SCM input_waiting;
+};
+
static void
soft_port_flush (SCM port)
{
- scm_t_port *pt = SCM_PTAB_ENTRY (port);
- SCM stream = SCM_PACK (pt->stream);
-
- SCM f = SCM_SIMPLE_VECTOR_REF (stream, 2);
+ struct soft_port *stream = (void *) SCM_STREAM (port);
- if (scm_is_true (f))
- scm_call_0 (f);
+ if (scm_is_true (stream->flush))
+ scm_call_0 (stream->flush);
}
static void
soft_port_write (SCM port, const void *data, size_t size)
{
- SCM p = SCM_PACK (SCM_STREAM (port));
+ struct soft_port *stream = (void *) SCM_STREAM (port);
/* DATA is assumed to be a locale-encoded C string, which makes it
hard to reliably pass binary data to a soft port. It can be
achieved by choosing a Latin-1 locale, though, but the recommended
approach is to use an R6RS "custom binary output port" instead. */
- scm_call_1 (SCM_SIMPLE_VECTOR_REF (p, 1),
+ scm_call_1 (stream->write_string,
scm_from_locale_stringn ((char *) data, size));
}
@@ -85,12 +91,12 @@ soft_port_write (SCM port, const void *data, size_t size)
static int
soft_port_fill_input (SCM port)
{
- SCM p = SCM_PACK (SCM_STREAM (port));
+ struct soft_port *stream = (void *) SCM_STREAM (port);
SCM ans;
scm_t_wchar c;
scm_t_port_internal *pti;
- ans = scm_call_0 (SCM_SIMPLE_VECTOR_REF (p, 3)); /* get char. */
+ ans = scm_call_0 (stream->read_char);
if (scm_is_false (ans) || SCM_EOF_OBJECT_P (ans))
return EOF;
SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "soft_port_fill_input");
@@ -125,26 +131,19 @@ soft_port_fill_input (SCM port)
static int
soft_port_close (SCM port)
{
- SCM p = SCM_PACK (SCM_STREAM (port));
- SCM f = SCM_SIMPLE_VECTOR_REF (p, 4);
- if (scm_is_false (f))
+ struct soft_port *stream = (void *) SCM_STREAM (port);
+ if (scm_is_false (stream->close))
return 0;
- f = scm_call_0 (f);
- errno = 0;
- return scm_is_false (f) ? EOF : 0;
+ return scm_is_false (scm_call_0 (stream->close)) ? EOF : 0;
}
static int
soft_port_input_waiting (SCM port)
{
- SCM p = SCM_PACK (SCM_STREAM (port));
- if (SCM_SIMPLE_VECTOR_LENGTH (p) >= 6)
- {
- SCM f = SCM_SIMPLE_VECTOR_REF (p, 5);
- if (scm_is_true (f))
- return scm_to_int (scm_call_0 (f));
- }
+ struct soft_port *stream = (void *) SCM_STREAM (port);
+ if (scm_is_true (stream->input_waiting))
+ return scm_to_int (scm_call_0 (stream->input_waiting));
/* Default is such that char-ready? for soft ports returns #t, as it
did before this extension was implemented. */
return 1;
@@ -202,14 +201,24 @@ SCM_DEFINE (scm_make_soft_port, "make-soft-port", 2, 0, 0,
{
int vlen;
SCM z;
+ struct soft_port *stream;
SCM_VALIDATE_VECTOR (1, pv);
vlen = SCM_SIMPLE_VECTOR_LENGTH (pv);
SCM_ASSERT ((vlen == 5) || (vlen == 6), pv, 1, FUNC_NAME);
SCM_VALIDATE_STRING (2, modes);
-
+
+ stream = scm_gc_typed_calloc (struct soft_port);
+ stream->write_char = SCM_SIMPLE_VECTOR_REF (pv, 0);
+ stream->write_string = SCM_SIMPLE_VECTOR_REF (pv, 1);
+ stream->flush = SCM_SIMPLE_VECTOR_REF (pv, 2);
+ stream->read_char = SCM_SIMPLE_VECTOR_REF (pv, 3);
+ stream->close = SCM_SIMPLE_VECTOR_REF (pv, 4);
+ stream->input_waiting =
+ vlen == 6 ? SCM_SIMPLE_VECTOR_REF (pv, 5) : SCM_BOOL_F;
+
z = scm_c_make_port (scm_tc16_soft_port, scm_i_mode_bits (modes),
- SCM_UNPACK (pv));
+ (scm_t_bits) stream);
scm_port_non_buffer (SCM_PTAB_ENTRY (z));
return z;
- [Guile-commits] branch wip-port-refactor created (now 8399e7a), Andy Wingo, 2016/04/06
- [Guile-commits] 08/18: Remove port equal functions, Andy Wingo, 2016/04/06
- [Guile-commits] 06/18: Remove port mark functions, Andy Wingo, 2016/04/06
- [Guile-commits] 14/18: Fix POLLOUT assignment from port buffers, Andy Wingo, 2016/04/06
- [Guile-commits] 02/18: display-{application, -backtrace} delegate to Scheme, Andy Wingo, 2016/04/06
- [Guile-commits] 13/18: Flush buffered reads / writes before seeking, Andy Wingo, 2016/04/06
- [Guile-commits] 15/18: Cosmetic changes to vports.c, Andy Wingo, 2016/04/06
- [Guile-commits] 01/18: Fix frame->stack-vector when no stack is active, Andy Wingo, 2016/04/06
- [Guile-commits] 07/18: Remove port free functions; just close instead, Andy Wingo, 2016/04/06
- [Guile-commits] 16/18: When making soft port, parse handlers into struct,
Andy Wingo <=
- [Guile-commits] 12/18: Whitespace fixes, Andy Wingo, 2016/04/06
- [Guile-commits] 05/18: Move line-buffing machinery to ports.c, Andy Wingo, 2016/04/06
- [Guile-commits] 10/18: Custom binary port internals refactor, Andy Wingo, 2016/04/06
- [Guile-commits] 04/18: Use symbols instead of _IONBF values as args to setvbuf, Andy Wingo, 2016/04/06
- [Guile-commits] 03/18: Move setvbuf impl to ports.[ch], Andy Wingo, 2016/04/06
- [Guile-commits] 09/18: Cosmetic changes to r6rs-ports.c, Andy Wingo, 2016/04/06
- [Guile-commits] 17/18: Port close functions return void, Andy Wingo, 2016/04/06
- [Guile-commits] 11/18: Refactor to rw_random / rw_active port flags, Andy Wingo, 2016/04/06
- [Guile-commits] 18/18: Generic port facility provides buffering uniformly, Andy Wingo, 2016/04/06