annotate src/EmacsShellP.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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Emacs shell widget internal header file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1994, 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 398
diff changeset
6 XEmacs is free software: you can redistribute it and/or modify it
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 under the terms of the GNU General Public License as published by the
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 398
diff changeset
8 Free Software Foundation, either version 3 of the License, or (at your
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 398
diff changeset
9 option) any later version.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 398
diff changeset
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 /* Written by Ben Wing, May, 1994. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 0
diff changeset
23 #ifndef INCLUDED_EmacsShellP_h_
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 0
diff changeset
24 #define INCLUDED_EmacsShellP_h_
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 #include "xintrinsic.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 #include <X11/ShellP.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 #include "EmacsShell.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 /****** TopLevelEmacsShell ******/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 typedef struct { /* new fields for TopLevelEmacsShell class */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 int dummy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 } TopLevelEmacsShellClassPart;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 /* full class record declaration */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 typedef struct _TopLevelEmacsShellClassRec {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 CoreClassPart core_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 CompositeClassPart composite_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 ShellClassPart shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 WMShellClassPart wm_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 VendorShellClassPart vendor_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 TopLevelShellClassPart top_level_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 TopLevelEmacsShellClassPart emacs_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 } TopLevelEmacsShellClassRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 typedef struct { /* new fields for TopLevelEmacsShell widget */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 int width_cells, height_cells;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 int min_width_cells, min_height_cells;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 } TopLevelEmacsShellPart;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 typedef struct _TopLevelEmacsShellRec { /* full instance record */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 CorePart core;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 CompositePart composite;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 ShellPart shell;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 WMShellPart wm;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 VendorShellPart vendor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 TopLevelShellPart top_level;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 TopLevelEmacsShellPart emacs_shell;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 } TopLevelEmacsShellRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 /* class pointer */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 extern TopLevelEmacsShellClassRec topLevelEmacsShellClassRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 /****** TransientEmacsShell ******/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 typedef struct { /* new fields for TransientEmacsShell class */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 int dummy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 } TransientEmacsShellClassPart;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 /* full class record declaration */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 typedef struct _TransientEmacsShellClassRec {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 CoreClassPart core_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 CompositeClassPart composite_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 ShellClassPart shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 WMShellClassPart wm_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 VendorShellClassPart vendor_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 TransientShellClassPart transient_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 TransientEmacsShellClassPart emacs_shell_class;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 } TransientEmacsShellClassRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 typedef struct { /* new fields for TransientEmacsShell widget */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 int width_cells, height_cells;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 int min_width_cells, min_height_cells;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 } TransientEmacsShellPart;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 typedef struct _TransientEmacsShellRec { /* full instance record */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 CorePart core;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 CompositePart composite;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 ShellPart shell;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 WMShellPart wm;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 VendorShellPart vendor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 TransientShellPart transient;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 TransientEmacsShellPart emacs_shell;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 } TransientEmacsShellRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 /* class pointer */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 extern TransientEmacsShellClassRec transientEmacsShellClassRec;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 0
diff changeset
100 #endif /* INCLUDED_EmacsShellP_h_ */