Mercurial > hg > xemacs-beta
view src/procimpl.h @ 5560:58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
src/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* alloc.c:
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT_1):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (cons_print_preprocess):
* alloc.c (vector_print_preprocess):
* alloc.c (vector_nsubst_structures_descend):
* alloc.c (Fmake_symbol):
* alloc.c (UNMARK_symbol):
* alloc.c (sweep_symbols):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* bytecode.c:
* bytecode.c (compiled_function_print_preprocess):
* bytecode.c (compiled_function_nsubst_structures_descend):
* bytecode.c (set_compiled_function_arglist):
* bytecode.c (set_compiled_function_interactive):
* bytecode.c (bytecode_objects_create):
* chartab.c:
* chartab.c (print_preprocess_mapper):
* chartab.c (nsubst_structures_mapper):
* chartab.c (char_table_nsubst_structures_descend):
* chartab.c (chartab_objects_create):
* elhash.c:
* elhash.c (nsubst_structures_map_hash_table):
* elhash.c (hash_table_nsubst_structures_descend):
* elhash.c (print_preprocess_mapper):
* elhash.c (hash_table_print_preprocess):
* elhash.c (inchash_eq):
* elhash.c (hash_table_objects_create):
* elhash.c (syms_of_elhash):
* elhash.h:
* emacs.c (main_1):
* fns.c:
* fns.c (check_eq_nokey):
* fns.c (Fnsubst):
* fns.c (syms_of_fns):
* lisp.h:
* lisp.h (struct Lisp_Symbol):
* lisp.h (IN_OBARRAY):
* lisp.h (struct):
* lisp.h (PRINT_PREPROCESS):
* lread.c (read1):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* print.c:
* print.c (PRINT_CIRCLE_LIMIT):
* print.c (print_continuous_numbering_changed):
* print.c (print_prepare):
* print.c (print_finish):
* print.c (Fprin1_to_string):
* print.c (print_cons):
* print.c (print_preprocess_inchash_eq):
* print.c (print_preprocess):
* print.c (print_sort_get_numbers):
* print.c (print_sort_compare_ordinals):
* print.c (print_gensym_or_circle):
* print.c (nsubst_structures_descend):
* print.c (nsubst_structures):
* print.c (print_internal):
* print.c (print_symbol):
* print.c (vars_of_print):
* rangetab.c:
* rangetab.c (range_table_print_preprocess):
* rangetab.c (range_table_nsubst_structures_descend):
* rangetab.c (rangetab_objects_create):
* rangetab.c (syms_of_rangetab):
* symbols.c:
* symbols.c (symbol_print_preprocess):
* symbols.c (Fintern):
* symbols.c (Funintern):
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symsinit.h:
Implement print-circle, printing circular structures in a readable
fashion, and treating them appropriately on read. This is by means
of two new object methods, print_preprocess (detecting
circularities), and nsubst_structures_descend (replacing
placeholders with the read objects).
Expose the substitution to Lisp via #'nsubst and its new
:descend-structures keyword.
Store information as to whether symbols are interned in obarray or
not in their header, making checking for keywords and uninterned
symbols (and thus printing) cheaper.
Default print_gensym to t, as Common Lisp does, and as a
more-than-decade old comment suggests.
lisp/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-output-file-form):
* bytecomp.el (byte-compile-output-docform):
Bind print-circle, print-continuous-numbering in these functions,
now those variables are available.
* lisp.el (forward-sexp):
* lisp.el (backward-sexp):
Recognise leading #N= as being part of an expression.
tests/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
* automated/lisp-tests.el (literal-with-uninterned):
* automated/symbol-tests.el (foo):
Test print-circle, for printing (mutually-)recursive and circular
structures.
Bind print-continuous-numbering where appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 04 Sep 2011 19:51:35 +0100 |
| parents | 308d34e9f07d |
| children | a216b3c2b09e |
line wrap: on
line source
/* Processes implementation header Copyright (C) 1985, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs 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 General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: ????. Split out of process.h. */ /* This file must be only included by the process implementation files: process-unix.c, process-msw.c etc. The Lisp_Process structure and other contents of this file is not exported to the rest of the world */ #ifndef INCLUDED_procimpl_h_ #define INCLUDED_procimpl_h_ /* * Structure which keeps methods of the process implementation. * There is only one object of this class exists in a particular * XEmacs implementation. */ /* #### Comment me... */ struct process_methods { void (*print_process_data) (Lisp_Process *proc, Lisp_Object printcharfun); void (*finalize_process_data) (Lisp_Process *proc); void (*alloc_process_data) (Lisp_Process *p); void (*init_process_io_handles) (Lisp_Process *p, void* in, void* out, void *err, int flags); int (*create_process) (Lisp_Process *p, Lisp_Object *argv, int nargv, Lisp_Object program, Lisp_Object cur_dir, int separate_err); int (*tooltalk_connection_p) (Lisp_Process *p); #ifdef HAVE_SOCKETS void (*open_network_stream) (Lisp_Object name, Lisp_Object host, Lisp_Object service, Lisp_Object protocol, void** vinfd, void** voutfd); #ifdef HAVE_MULTICAST void (*open_multicast_group) (Lisp_Object name, Lisp_Object dest, Lisp_Object port, Lisp_Object ttl, void** vinfd, void** voutfd); #endif /* HAVE_MULTICAST */ #endif /* HAVE_SOCKETS */ Lisp_Object (*canonicalize_host_name) (Lisp_Object host); int (*set_window_size) (Lisp_Process* p, int height, int width); void (*send_process) (Lisp_Object proc, struct lstream* lstream); void (*reap_exited_processes) (void); void (*update_status_if_terminated) (Lisp_Process* p); void (*kill_child_process) (Lisp_Object proc, int signo, int current_group, int nomsg); int (*kill_process_by_pid) (int pid, int sigcode); int (*process_send_eof) (Lisp_Object proc); void (*deactivate_process) (Lisp_Process *p, USID* in_usid, USID* err_usid); void (*init_process) (void); }; extern struct process_methods the_process_methods; /* * Accessors for process_methods */ #define HAS_PROCMETH_P(name) (the_process_methods.name != 0) #define PROCMETH(name, par) ((the_process_methods.name) par) #define PROCMETH_OR_GIVEN(name, par, given) (HAS_PROCMETH_P(name) ? PROCMETH(name, par) : (given)) #define MAYBE_PROCMETH(name, par) do { if (HAS_PROCMETH_P(name)) PROCMETH(name, par); } while (0); #define MAYBE_LISP_PROCMETH(name, par) PROCMETH_OR_GIVEN(name, par, Qnil) #define MAYBE_INT_PROCMETH(name, par) PROCMETH_OR_GIVEN(name, par, 0) #define PROCESS_HAS_METHOD(os, name) the_process_methods.name = os##_##name /* * Structure records pertinent information about open channels. * There is one channel associated with each process. */ struct Lisp_Process { NORMAL_LISP_OBJECT_HEADER header; /* Exit code if process has terminated, signal which stopped/interrupted process or 0 if process is running */ int exit_code; /* Non-false if process has exited and "dumped core" on its way down */ char core_dumped; /* #### Is this field unused? */ /* if this flag is not NIL, then filter will do the read on the channel, rather than having a call to make_string. This only works if the filter is a subr. */ char filter_does_read; /* Non-zero means kill silently if Emacs is exited. */ char kill_without_query; char in_selected, err_selected; /* Event-count of last event in which this process changed status. */ volatile int tick; /* Event-count of last such event reported. */ int update_tick; /* Non-zero if stderr and stdout are separated. */ char separate_stderr; #define MARKED_SLOT(x) Lisp_Object x; #include "process-slots.h" /* Implementation dependent data */ void *process_data; }; /* Macros to refer to data connection streams */ #define DATA_INSTREAM(p) (p)->coding_instream #define DATA_OUTSTREAM(p) (p)->coding_outstream #define DATA_ERRSTREAM(p) (p)->coding_errstream /* Random externs from process.c */ extern Lisp_Object Qrun, Qstop, Qopen, Qclosed; extern Lisp_Object Qtcp, Qudp; extern Lisp_Object Vprocess_connection_type; extern Lisp_Object Vprocess_list; extern struct hash_table *usid_to_process; extern volatile int process_tick; extern int windowed_process_io; #ifdef PROCESS_IO_BLOCKING extern Lisp_Object network_stream_blocking_port_list; #endif /* PROCESS_IO_BLOCKING */ Lisp_Object make_process_internal (Lisp_Object name); void init_process_io_handles (Lisp_Process *p, void* in, void* out, void *err, int flags); void send_process (Lisp_Object proc, Lisp_Object relocatable, const Ibyte *nonrelocatable, int start, int len); #endif /* INCLUDED_procimpl_h_ */
