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.

1 files changed, 11 insertions, 11 deletions

diff --git a/libguile/vports.c b/libguile/vports.c
index 5ef54fdce..0f3823bc2 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -50,7 +50,7 @@
  */
 
 
-static scm_t_bits scm_tc16_soft_port;
+static scm_t_port_type *scm_soft_port_type;
 
 #define ENCODE_BUF_SIZE 10
 
@@ -221,31 +221,31 @@ SCM_DEFINE (scm_make_soft_port, "make-soft-port", 2, 0, 0,
   stream->input_waiting =
     vlen == 6 ? SCM_SIMPLE_VECTOR_REF (pv, 5) : SCM_BOOL_F;
 
-  return scm_c_make_port (scm_tc16_soft_port, scm_i_mode_bits (modes),
+  return scm_c_make_port (scm_soft_port_type, scm_i_mode_bits (modes),
                           (scm_t_bits) stream);
 }
 #undef FUNC_NAME
 
 
-static scm_t_bits
+static scm_t_port_type *
 scm_make_sfptob ()
 {
-  scm_t_bits tc = scm_make_port_type ("soft", soft_port_read,
-                                      soft_port_write);
+  scm_t_port_type *ptob = scm_make_port_type ("soft", soft_port_read,
+                                              soft_port_write);
 
-  scm_set_port_close (tc, soft_port_close);
-  scm_set_port_needs_close_on_gc (tc, 1);
-  scm_set_port_get_natural_buffer_sizes (tc,
+  scm_set_port_close (ptob, soft_port_close);
+  scm_set_port_needs_close_on_gc (ptob, 1);
+  scm_set_port_get_natural_buffer_sizes (ptob,
                                          soft_port_get_natural_buffer_sizes);
-  scm_set_port_input_waiting (tc, soft_port_input_waiting);
+  scm_set_port_input_waiting (ptob, soft_port_input_waiting);
 
-  return tc;
+  return ptob;
 }
 
 void
 scm_init_vports ()
 {
-  scm_tc16_soft_port = scm_make_sfptob ();
+  scm_soft_port_type = scm_make_sfptob ();
 
 #include "libguile/vports.x"
 }