Port buffers are Scheme values

* libguile/ports-internal.h (scm_port_buffer_bytevector)
  (scm_port_buffer_cur, scm_port_buffer_set_cur)
  (scm_port_buffer_end, scm_port_buffer_set_end)
  (scm_port_buffer_has_eof_p, scm_port_buffer_set_has_eof_p): New
  helpers.
* libguile/ports-internal.h (scm_port_buffer_size)
  (scm_port_buffer_reset, scm_port_buffer_reset_end)
  (scm_port_buffer_can_take, scm_port_buffer_can_put)
  (scm_port_buffer_can_putback, scm_port_buffer_did_take)
  (scm_port_buffer_did_put, scm_port_buffer_take_pointer)
  (scm_port_buffer_put_pointer, scm_port_buffer_take)
  (scm_port_buffer_put, scm_port_buffer_putback): Adapt to treat port
  buffers as SCM values and use helpers to access them.
* libguile/ports.c (scm_i_clear_pending_eof, scm_i_set_pending_eof)
  (scm_c_make_port_buffer, scm_i_read_unlocked)
  (scm_c_read_bytes_unlocked, scm_i_unget_bytes_unlocked)
  (scm_setvbuf, scm_fill_input, scm_take_from_input_buffers)
  (scm_drain_input, scm_end_input_unlocked, scm_flush_unlocked)
  (scm_fill_input_unlocked, scm_i_write_unlocked)
  (scm_c_write_bytes_unlocked, scm_c_write_unlocked)
  (scm_char_ready_p): Adapt to treat port buffers as SCM values and use
  helpers to access them.
  (scm_port_read_buffer, scm_port_write_buffer): New functions,
  allowing (ice-9 ports) to access port buffers.
* libguile/ports.h: Update comments on port buffers.  Replace
  scm_t_port_buffer structure with a Scheme vector whose fields are
  enumerated by "enum scm_port_buffer_field".
  (scm_get_byte_or_eof_unlocked, scm_peek_byte_or_eof_unlocked): Adapt
  these implementations to port buffer representation change.
* libguile/r6rs-ports.c (scm_get_bytevector_some):
* libguile/read.c (scm_i_scan_for_encoding):
* libguile/rw.c (scm_write_string_partial): Port buffers are Scheme
  objects.

1 files changed, 2 insertions, 2 deletions

diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 4c5c87ca5..e96e2205b 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -468,7 +468,7 @@ SCM_DEFINE (scm_get_bytevector_some, "get-bytevector-some", 1, 0, 0,
             "position to point just past these bytes.")
 #define FUNC_NAME s_scm_get_bytevector_some
 {
-  scm_t_port_buffer *buf;
+  SCM buf;
   size_t size;
   SCM bv;
 
@@ -478,7 +478,7 @@ SCM_DEFINE (scm_get_bytevector_some, "get-bytevector-some", 1, 0, 0,
   size = scm_port_buffer_can_take (buf);
   if (size == 0)
     {
-      buf->has_eof_p = SCM_BOOL_F;
+      scm_port_buffer_set_has_eof_p (buf, SCM_BOOL_F);
       return SCM_EOF_VAL;
     }