Mercurial > hg > xemacs-beta
annotate src/devslots.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 |
| rev | line source |
|---|---|
| 617 | 1 /* Definitions of marked slots in consoles |
| 2 Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. | |
| 872 | 3 Copyright (C) 2002 Ben Wing. |
| 617 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 617 | 8 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:
5176
diff
changeset
|
9 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:
5176
diff
changeset
|
10 option) any later version. |
| 617 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 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:
5176
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 617 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 22 /* We define the Lisp_Objects in the device structure in a separate file | |
| 23 because there are numerous places we want to iterate over them, such | |
| 24 as when defining them in the structure, initializing them, or marking | |
| 25 them. | |
| 26 | |
| 1204 | 27 To use, define MARKED_SLOT before including this file. No need to |
| 28 undefine; that happens automatically. */ | |
| 617 | 29 |
| 30 /* Name of this device, for resourcing and printing purposes. | |
| 31 If not explicitly given, it's initialized in a device-specific | |
| 32 manner. */ | |
| 1204 | 33 MARKED_SLOT (name) |
| 617 | 34 |
| 35 /* What this device is connected to */ | |
| 1204 | 36 MARKED_SLOT (connection) |
| 617 | 37 |
| 38 /* A canonical name for the connection that is used to determine | |
| 39 whether `make-device' is being called on an existing device. */ | |
| 1204 | 40 MARKED_SLOT (canon_connection) |
| 617 | 41 |
| 42 /* List of frames on this device. */ | |
| 1204 | 43 MARKED_SLOT (frame_list) |
| 617 | 44 |
| 45 /* The console this device is on. */ | |
| 1204 | 46 MARKED_SLOT (console) |
| 617 | 47 |
| 48 /* Frame which is "currently selected". This is what `selected-frame' | |
| 49 returns and is the default frame for many operations. This may | |
| 1204 | 50 not be the same as frame_with_focus `select-frame' changes the |
| 617 | 51 selected_frame but not the frame_with_focus. However, eventually |
| 52 either the two values will be the same, or frame_with_focus will | |
| 53 be nil: right before waiting for an event, the focus is changed | |
| 54 to point to the selected_frame if XEmacs currently has the focus | |
| 55 on this device. Note that frame_with_focus may be nil (none of the | |
| 56 frames on this device have the window-system focus), but | |
| 57 selected_frame will never be nil if there are any frames on | |
| 58 the device. */ | |
| 1204 | 59 MARKED_SLOT (selected_frame) |
| 617 | 60 /* Frame that currently contains the window-manager focus, or none. |
| 61 Note that we've split frame_with_focus into two variables. | |
| 62 frame_with_focus_real is the value we use most of the time, | |
| 63 but frame_with_focus_for_hooks is used for running the select-frame-hook | |
| 64 and deselect-frame-hook. We do this because we split the focus handling | |
| 65 into two parts: one part (deals with drawing the solid/box cursor) | |
| 1204 | 66 runs as soon as a focus event is received the other (running the |
| 617 | 67 hooks) runs after any pending sit-for/sleep-for/accept-process-output |
| 68 calls are done. */ | |
| 1204 | 69 MARKED_SLOT (frame_with_focus_real) |
| 70 MARKED_SLOT (frame_with_focus_for_hooks) | |
| 617 | 71 /* If we have recently issued a request to change the focus as a |
| 72 result of select-frame having been called, the following variable | |
| 73 records the frame we are trying to focus on. The reason for this | |
| 74 is that the window manager may not grant our request to change | |
| 75 the focus (so we can't just change frame_with_focus), and we don't | |
| 76 want to keep sending requests again and again to the window manager. | |
| 77 This variable is reset whenever a focus-change event is seen. */ | |
| 1204 | 78 MARKED_SLOT (frame_that_ought_to_have_focus) |
| 617 | 79 |
| 80 /* Color class of this device. */ | |
| 1204 | 81 MARKED_SLOT (device_class) |
| 617 | 82 |
| 83 /* Alist of values for user-defined tags in this device. */ | |
| 1204 | 84 MARKED_SLOT (user_defined_tags) |
| 617 | 85 |
| 86 /* Hash tables for device-specific objects (fonts, colors, etc). | |
| 87 These are key-weak hash tables (or hash tables containing key-weak | |
| 88 hash tables) so that they disappear when the key goes away. */ | |
| 89 | |
| 90 /* This is a simple key-weak hash table hashing color names to | |
| 91 instances. */ | |
| 1204 | 92 MARKED_SLOT (color_instance_cache) |
| 617 | 93 |
| 94 /* This is a simple key-weak hash table hashing font names to | |
| 95 instances. */ | |
| 1204 | 96 MARKED_SLOT (font_instance_cache) |
| 617 | 97 |
| 98 #ifdef MULE | |
| 99 /* This is a bi-level cache, where the hash table in this slot here | |
| 100 indexes charset objects to key-weak hash tables, which in turn | |
| 101 index font names to more specific font names that match the | |
| 102 given charset's registry. This speeds up the horrendously | |
| 103 slow XListFonts() operation that needs to be done in order | |
| 104 to determine an appropriate font. */ | |
| 1204 | 105 MARKED_SLOT (charset_font_cache_stage_1) |
| 872 | 106 |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
1204
diff
changeset
|
107 /* Similar cache for stage 2, if it exists. See fontcolor.c. */ |
| 1204 | 108 MARKED_SLOT (charset_font_cache_stage_2) |
| 617 | 109 #endif |
| 110 | |
| 111 /* This is a bi-level cache, where the hash table in this slot here | |
| 112 indexes image-instance-type masks (there are currently 6 | |
| 113 image-instance types and thus 64 possible masks) to key-weak hash | |
| 114 tables like the one for colors. */ | |
| 1204 | 115 MARKED_SLOT (image_instance_cache) |
| 617 | 116 |
| 117 #undef MARKED_SLOT |