mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-07-02 07:40:30 +02:00
3cf4ca187c
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.
118 lines
5.2 KiB
C
118 lines
5.2 KiB
C
#ifndef SCM_DEPRECATED_H
|
|
#define SCM_DEPRECATED_H
|
|
|
|
/* Copyright 2003-2007,2009-2018,2020-2022,2025
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of Guile.
|
|
|
|
Guile is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU Lesser General Public License as published
|
|
by the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Guile is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
|
License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with Guile. If not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include "libguile/snarf.h"
|
|
|
|
#if (SCM_ENABLE_DEPRECATED == 1)
|
|
|
|
#define SCM_SMOB_MARK SCM_SMOB_MARK__Gone__Contact_guile_devel_for_alternatives
|
|
#define SCM_GLOBAL_SMOB_MARK SCM_GLOBAL_SMOB_MARK__Gone__Contact_guile_devel_for_alternatives
|
|
#define scm_mark0 scm_mark0__Gone__Contact_guile_devel_for_alternatives
|
|
#define scm_markcdr scm_markcdr__Gone__Contact_guile_devel_for_alternatives
|
|
#define scm_free0 scm_free0__Gone__Contact_guile_devel_for_alternatives
|
|
#define scm_set_smob_mark scm_set_smob_mark__Gone__Contact_guile_devel_for_alternatives
|
|
#define scm_gc_mark scm_gc_mark__Gone__Contact_guile_devel_for_alternatives
|
|
|
|
SCM_DEPRECATED SCM scm_make_guardian (void);
|
|
|
|
#define SCM_I_WVECTP(x) (scm_is_weak_vector (x))
|
|
|
|
SCM_DEPRECATED SCM scm_make_weak_vector (SCM len, SCM fill);
|
|
SCM_DEPRECATED SCM scm_weak_vector (SCM l);
|
|
SCM_DEPRECATED SCM scm_weak_vector_p (SCM x);
|
|
SCM_DEPRECATED SCM scm_weak_vector_length (SCM v);
|
|
SCM_DEPRECATED SCM scm_weak_vector_ref (SCM v, SCM k);
|
|
SCM_DEPRECATED SCM scm_weak_vector_set_x (SCM v, SCM k, SCM x);
|
|
|
|
SCM_DEPRECATED SCM scm_c_make_weak_vector (size_t len, SCM fill);
|
|
SCM_DEPRECATED int scm_is_weak_vector (SCM obj);
|
|
SCM_DEPRECATED size_t scm_c_weak_vector_length (SCM vec);
|
|
SCM_DEPRECATED SCM scm_c_weak_vector_ref (SCM v, size_t k);
|
|
SCM_DEPRECATED void scm_c_weak_vector_set_x (SCM v, size_t k, SCM x);
|
|
|
|
SCM_DEPRECATED SCM scm_object_properties (SCM obj);
|
|
SCM_DEPRECATED SCM scm_set_object_properties_x (SCM obj, SCM plist);
|
|
SCM_DEPRECATED SCM scm_object_property (SCM obj, SCM key);
|
|
SCM_DEPRECATED SCM scm_set_object_property_x (SCM obj, SCM key, SCM val);
|
|
|
|
SCM_DEPRECATED SCM scm_sym_filename;
|
|
SCM_DEPRECATED SCM scm_sym_line;
|
|
SCM_DEPRECATED SCM scm_sym_column;
|
|
SCM_DEPRECATED SCM scm_supports_source_properties_p (SCM obj);
|
|
SCM_DEPRECATED SCM scm_source_property (SCM obj, SCM key);
|
|
SCM_DEPRECATED SCM scm_set_source_property_x (SCM obj, SCM key, SCM datum);
|
|
SCM_DEPRECATED SCM scm_source_properties (SCM obj);
|
|
SCM_DEPRECATED SCM scm_set_source_properties_x (SCM obj, SCM props);
|
|
SCM_DEPRECATED SCM scm_cons_source (SCM xorig, SCM x, SCM y);
|
|
|
|
SCM_DEPRECATED SCM scm_array_fill_x (SCM ra, SCM fill);
|
|
SCM_DEPRECATED SCM scm_array_copy_x (SCM src, SCM dst);
|
|
SCM_DEPRECATED SCM scm_array_map_x (SCM ra0, SCM proc, SCM lra);
|
|
SCM_DEPRECATED SCM scm_array_for_each (SCM proc, SCM ra0, SCM lra);
|
|
SCM_DEPRECATED SCM scm_array_index_map_x (SCM ra, SCM proc);
|
|
SCM_DEPRECATED SCM scm_array_equal_p (SCM ra0, SCM ra1);
|
|
SCM_DEPRECATED SCM scm_array_slice_for_each (SCM frank, SCM op, SCM args);
|
|
SCM_DEPRECATED SCM scm_array_slice_for_each_in_order (SCM frank, SCM op, SCM args);
|
|
SCM_DEPRECATED SCM scm_array_cell_ref (SCM array, SCM indices);
|
|
SCM_DEPRECATED SCM scm_array_cell_set_x (SCM array, SCM val, SCM indices);
|
|
|
|
SCM_DEPRECATED SCM scm_char_set_cursor (SCM cs);
|
|
SCM_DEPRECATED SCM scm_char_set_ref (SCM cs, SCM cursor);
|
|
SCM_DEPRECATED SCM scm_char_set_cursor_next (SCM cs, SCM cursor);
|
|
SCM_DEPRECATED SCM scm_end_of_char_set_p (SCM cursor);
|
|
|
|
#define SCM_HOOKP SCM_HOOKP__Gone__Use_Ice_9_Hooks
|
|
#define SCM_HOOK_ARITY SCM_HOOK_ARITY__Gone__Use_Ice_9_Hooks
|
|
#define SCM_HOOK_PROCEDURES SCM_HOOK_PROCEDURES__Gone__Use_Ice_9_Hooks
|
|
#define SCM_SET_HOOK_PROCEDURES SCM_SET_HOOK_PROCEDURES__Gone__Use_Ice_9_Hooks
|
|
#define SCM_VALIDATE_HOOK SCM_VALIDATE_HOOK__GON__Use_Ice_9_Hooks
|
|
|
|
SCM_DEPRECATED SCM scm_make_hook (SCM n_args);
|
|
SCM_DEPRECATED SCM scm_hook_p (SCM x);
|
|
SCM_DEPRECATED SCM scm_hook_empty_p (SCM hook);
|
|
SCM_DEPRECATED SCM scm_add_hook_x (SCM hook, SCM thunk, SCM appendp);
|
|
SCM_DEPRECATED SCM scm_remove_hook_x (SCM hook, SCM thunk);
|
|
SCM_DEPRECATED SCM scm_reset_hook_x (SCM hook);
|
|
SCM_DEPRECATED SCM scm_run_hook (SCM hook, SCM args);
|
|
SCM_DEPRECATED void scm_c_run_hook (SCM hook, SCM args);
|
|
SCM_DEPRECATED void scm_c_run_hookn (SCM hook, SCM *argv, size_t nargs);
|
|
SCM_DEPRECATED SCM scm_hook_to_list (SCM hook);
|
|
|
|
SCM_DEPRECATED void scm_free_print_state (SCM print_state);
|
|
|
|
SCM_DEPRECATED SCM scm_coerce_outport (SCM x);
|
|
SCM_DEPRECATED int scm_valid_oport_value_p (SCM val);
|
|
SCM_DEPRECATED SCM scm_make_print_state (void);
|
|
SCM_DEPRECATED SCM scm_printer_apply (SCM proc, SCM exp, SCM port, scm_print_state *);
|
|
SCM_DEPRECATED SCM scm_port_with_print_state (SCM port, SCM pstate);
|
|
SCM_DEPRECATED SCM scm_get_print_state (SCM port);
|
|
|
|
#define SCM_COERCE_OUTPORT(p) (scm_coerce_outport (p))
|
|
#define SCM_VALIDATE_OPORT_VALUE(pos, port) SCM_VALIDATE_OPOUTPORT(pos, port)
|
|
|
|
/* Deprecated declarations go here. */
|
|
|
|
void scm_i_init_deprecated (void);
|
|
|
|
#endif
|
|
|
|
#endif /* SCM_DEPRECATED_H */
|