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

Use heap-allocated port types instead of ptobnums

Browse source 
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.
This commit is contained in:
Andy Wingo 2016-05-13 18:23:47 +02:00
parent 17f90360b6
commit cd51ce81d0
17 changed files with 190 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libguile/fports.c
View file

@ -72,7 +72,7 @@
#error Oops, unknown OFF_T size
#endif
scm_t_bits scm_tc16_fport;
scm_t_port_type *scm_file_port_type;
/* Move ports with the specified file descriptor to new descriptors,
@ -409,7 +409,7 @@ scm_i_fdes_to_port (int fdes, long mode_bits, SCM name)
"file port");
fp->fdes = fdes;
port = scm_c_make_port (scm_tc16_fport, mode_bits, (scm_t_bits)fp);
port = scm_c_make_port (scm_file_port_type, mode_bits, (scm_t_bits)fp);
SCM_SET_FILENAME (port, name);
@ -547,7 +547,7 @@ fport_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
if (scm_is_string (name) || scm_is_symbol (name))
scm_display (name, port);
else
scm_puts (SCM_PTOBNAME (SCM_PTOBNUM (exp)), port);
scm_puts (SCM_PORT_TYPE (exp)->name, port);
scm_putc (' ', port);
fdes = (SCM_FSTREAM (exp))->fdes;
@ -560,7 +560,7 @@ fport_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
}
else
{
scm_puts (SCM_PTOBNAME (SCM_PTOBNUM (exp)), port);
scm_puts (SCM_PORT_TYPE (exp)->name, port);
scm_putc (' ', port);
scm_uintprint ((scm_t_bits) SCM_PORT (exp), 16, port);
}
@ -650,21 +650,21 @@ fport_get_natural_buffer_sizes (SCM port, size_t *read_size, size_t *write_size)
#endif
}
static scm_t_bits
static scm_t_port_type *
scm_make_fptob ()
{
scm_t_bits tc = scm_make_port_type ("file", fport_read, fport_write);
scm_t_port_type *ptob = scm_make_port_type ("file", fport_read, fport_write);
scm_set_port_print (tc, fport_print);
scm_set_port_needs_close_on_gc (tc, 1);
scm_set_port_close (tc, fport_close);
scm_set_port_seek (tc, fport_seek);
scm_set_port_truncate (tc, fport_truncate);
scm_set_port_input_waiting (tc, fport_input_waiting);
scm_set_port_random_access_p (tc, fport_random_access_p);
scm_set_port_get_natural_buffer_sizes (tc, fport_get_natural_buffer_sizes);
scm_set_port_print (ptob, fport_print);
scm_set_port_needs_close_on_gc (ptob, 1);
scm_set_port_close (ptob, fport_close);
scm_set_port_seek (ptob, fport_seek);
scm_set_port_truncate (ptob, fport_truncate);
scm_set_port_input_waiting (ptob, fport_input_waiting);
scm_set_port_random_access_p (ptob, fport_random_access_p);
scm_set_port_get_natural_buffer_sizes (ptob, fport_get_natural_buffer_sizes);
return tc;
return ptob;
}
/* We can't initialize the keywords from 'scm_init_fports', because
@ -685,7 +685,7 @@ scm_init_ice_9_fports (void)
void
scm_init_fports ()
{
scm_tc16_fport = scm_make_fptob ();
scm_file_port_type = scm_make_fptob ();
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
"scm_init_ice_9_fports",