summaryrefslogtreecommitdiff
path: root/test-suite/standalone
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-05-13 18:23:47 +0200
committerAndy Wingo <wingo@pobox.com>2016-05-13 18:31:29 +0200
commitcd51ce81d047a10c55c450ea7b2bf5ab8b8340be (patch)
tree408738ccb0b6cc19d465a58420e8fc9e548a285d /test-suite/standalone
parent17f90360b6057034135ec93ffae340fa514208af (diff)
downloadguile-cd51ce81d047a10c55c450ea7b2bf5ab8b8340be.tar.gz
Use heap-allocated port types instead of ptobnums
This removes a limitation on the number of port types, simplifies the API, and removes a central point of coordination. * libguile/ports-internal.h (struct scm_t_port_type): Rename from scm_t_ptob_descriptor, now that it's private. Add GOOPS class fields. (struct scm_t_port): Rename from struct scm_port, especially considering that deprecated.h redefines scm_port using the preprocessor :(. * libguile/ports.h: Add definitions of SCM_PORT and SCM_PORT_TYPE, though the scm_t_port and scm_t_port_type types are incomplete. (SCM_TC2PTOBNUM, SCM_PTOBNUM, SCM_PTOBNAME): Remove, as there are no more typecodes for port types. (scm_c_num_port_types, scm_c_port_type_ref, scm_c_port_type_add_x): Remove. (scm_make_port_type): Return a scm_t_port_type*. All methods adapted to take a scm_t_port_type* instead of a ptobnum. (scm_c_make_port_with_encoding, scm_c_make_port): Take a port type pointer instead of a tag. (scm_new_port_table_entry): Remove; not useful. * libguile/ports.c: Remove things related to the port kind table. Adapt uses of SCM_PORT_DESCRIPTOR / scm_t_ptob_descriptor to use SCM_PORT_TYPE and scm_t_port_type. * libguile/deprecated.c: * libguile/deprecated.h: * libguile/filesys.c: * libguile/fports.c: * libguile/fports.h: * libguile/print.c: * libguile/r6rs-ports.c: * libguile/strports.c: * libguile/strports.h: * libguile/tags.h: * libguile/vports.c: * test-suite/standalone/test-scm-c-read.c: Adapt to change. * libguile/goops.c (scm_class_of, make_port_classes) (scm_make_port_classes, create_port_classes): Adapt to store the classes in the ptob.
Diffstat (limited to 'test-suite/standalone')
-rw-r--r--test-suite/standalone/test-scm-c-read.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test-suite/standalone/test-scm-c-read.c b/test-suite/standalone/test-scm-c-read.c
index 7850f3447..c4dbf6251 100644
--- a/test-suite/standalone/test-scm-c-read.c
+++ b/test-suite/standalone/test-scm-c-read.c
@@ -43,7 +43,7 @@ struct custom_port
/* Return a new port of type PORT_TYPE. */
static inline SCM
-make_port (scm_t_bits port_type)
+make_port (scm_t_port_type *port_type)
{
struct custom_port *stream = scm_gc_typed_calloc (struct custom_port);
@@ -88,7 +88,7 @@ static void *
do_start (void *arg)
{
SCM port;
- scm_t_bits port_type;
+ scm_t_port_type *port_type;
char buffer[PORT_BUFFER_SIZE + (PORT_BUFFER_SIZE / 2)];
size_t read, last_read;