From cd51ce81d047a10c55c450ea7b2bf5ab8b8340be Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 13 May 2016 18:23:47 +0200 Subject: 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. --- libguile/strports.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libguile/strports.c') diff --git a/libguile/strports.c b/libguile/strports.c index 1aecc481b..1a893ac34 100644 --- a/libguile/strports.c +++ b/libguile/strports.c @@ -54,7 +54,7 @@ SCM_SYMBOL (sym_UTF_8, "UTF-8"); -scm_t_bits scm_tc16_strport; +scm_t_port_type *scm_string_port_type; struct string_port { SCM bytevector; @@ -181,7 +181,7 @@ scm_mkstrport (SCM pos, SCM str, long modes, const char *caller) stream->len = len; return - scm_c_make_port_with_encoding (scm_tc16_strport, modes, sym_UTF_8, + scm_c_make_port_with_encoding (scm_string_port_type, modes, sym_UTF_8, scm_i_default_port_conversion_strategy (), (scm_t_bits) stream); } @@ -375,21 +375,21 @@ scm_eval_string (SCM string) return scm_eval_string_in_module (string, SCM_UNDEFINED); } -static scm_t_bits +static scm_t_port_type * scm_make_string_port_type () { - scm_t_bits tc = scm_make_port_type ("string", - string_port_read, - string_port_write); - scm_set_port_seek (tc, string_port_seek); + scm_t_port_type *ptob = scm_make_port_type ("string", + string_port_read, + string_port_write); + scm_set_port_seek (ptob, string_port_seek); - return tc; + return ptob; } void scm_init_strports () { - scm_tc16_strport = scm_make_string_port_type (); + scm_string_port_type = scm_make_string_port_type (); #include "libguile/strports.x" } -- cgit v1.2.3