mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-07-02 23:50:47 +02:00
Remove print state objects, and ports-with-print-state
The goal was that, as part of a print operation, all nested prints of contained data would be able to use the same parameters (e.g. write or not), and also detect cycles, highlight objects, etc. The mechanism was a heap-allocated data structure. However, given that: 1. Nobody accessed print states from Scheme 2. `write` and `display` should move to Scheme anyway, in order to be suspendable 3. The "fancyp" and "highlight" options were unused 4. A simple stack-allocated data structure with a per-thread key could do the trick just as well, without needing the weird freelist structure 5. Ports-with-print-states were a source of bugs In the end we switch print states to be something completely internal to print.c. There are no more SCM print-state objects, and no more ports-with-print-state. * libguile/print.h: Remove print state from API. * libguile/print.c (struct scm_print_state): Move definition here. (scm_print_opts): Remove "highlight-prefix" and "highlight-suffix" options, as they were not used. (ENTER_NESTED_DATA): Remove "fancyp" case. (init_print_state_key, get_print_state, push_print_state) (maybe_push_print_state, pop_print_state): New facility to manage stack of active print states. (scm_iprin1, print_vector): No more fancyp. (iprin1): Access "writingp" member directly. Don't make ports with print states. (scm_prin1): Manage print state stack. (scm_iprlist): No more fancyp. (scm_valid_oport_value_p): Remove; valid outports are SCM_OPOUTPORTP. * libguile/backtrace.c: * libguile/filesys.c: * libguile/fports.c: * libguile/goops.c: * libguile/ioext.c: * libguile/ports.c: * libguile/posix.c: * libguile/promises.c: * libguile/socket.c: * libguile/struct.c: Remove cases that dealt with ports-with-print-states. * libguile/private-options.h: Remove highlight options. * module/ice-9/ports.scm (inherit-print-state): Deprecate. * libguile/deprecated.c: * libguile/deprecated.h: Add deprecation shims for print states, as far as that is possible.
This commit is contained in:
parent
d1b548033c
commit
3cf4ca187c
16 changed files with 181 additions and 425 deletions
|
@ -121,8 +121,7 @@
|
|||
call-with-output-string
|
||||
with-output-to-string
|
||||
with-error-to-string
|
||||
the-eof-object
|
||||
inherit-print-state))
|
||||
the-eof-object))
|
||||
|
||||
(define (replace-bootstrap-bindings syms)
|
||||
(for-each
|
||||
|
@ -582,7 +581,8 @@ composed of the characters written into the port is returned."
|
|||
(call-with-output-string
|
||||
(lambda (p) (with-error-to-port p thunk))))
|
||||
|
||||
(define (inherit-print-state old-port new-port)
|
||||
(if (get-print-state old-port)
|
||||
(port-with-print-state new-port (get-print-state old-port))
|
||||
new-port))
|
||||
(begin-deprecated
|
||||
(define-public (inherit-print-state old-port new-port)
|
||||
(issue-deprecation-warning
|
||||
"inherit-print-state is deprecated and no longer needed.")
|
||||
new-port))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue