Mercurial > hg > xemacs-beta
annotate src/coding-system-slots.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 |
|---|---|
| 1204 | 1 /* Definitions of marked slots in coding systems |
| 2 Copyright (C) 1991, 1995 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 4 Copyright (C) 2000, 2001, 2002 Ben Wing. | |
| 5 | |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4568
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 1204 | 9 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:
4568
diff
changeset
|
10 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:
4568
diff
changeset
|
11 option) any later version. |
| 1204 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 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:
4568
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 1204 | 20 |
| 21 /* Synched up with: ????. Split out of file-coding.h. */ | |
| 22 | |
| 23 /* We define the Lisp_Objects in the coding system structure in a separate | |
| 24 file because there are numerous places we want to iterate over them, | |
| 25 such as when defining them in the structure, initializing them, or | |
| 26 marking them. | |
| 27 | |
| 28 To use, define MARKED_SLOT before including this file. In the structure | |
| 29 definition, you also need to define CODING_SYSTEM_SLOT_DECLARATION. No | |
| 30 need to undefine either value; that happens automatically. */ | |
| 31 | |
| 32 #ifndef MARKED_SLOT_ARRAY | |
| 33 #ifdef CODING_SYSTEM_SLOT_DECLARATION | |
| 34 #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size]) | |
| 35 #else | |
| 36 #define MARKED_SLOT_ARRAY(slot, size) do { \ | |
| 37 int mslotidx; \ | |
| 38 for (mslotidx = 0; mslotidx < size; mslotidx++) \ | |
| 39 { \ | |
| 40 MARKED_SLOT (slot[mslotidx]) \ | |
| 41 } \ | |
| 42 } while (0); | |
| 43 #endif | |
| 44 #endif /* not MARKED_SLOT_ARRAY */ | |
| 45 | |
| 46 /* Name and description of this coding system. The description | |
| 47 should be suitable for a menu entry. */ | |
| 48 MARKED_SLOT (name) | |
| 49 MARKED_SLOT (description) | |
| 50 | |
| 51 /* Mnemonic string displayed in the modeline when this coding | |
| 52 system is active for a particular buffer. */ | |
| 53 MARKED_SLOT (mnemonic) | |
| 54 | |
| 55 /* Long documentation on the coding system. */ | |
| 56 MARKED_SLOT (documentation) | |
| 57 /* Functions to handle additional conversion after reading or before | |
| 58 writing. #### This mechanism should be replaced by the ability to | |
| 59 simply create new coding system types. */ | |
| 60 MARKED_SLOT (post_read_conversion) | |
| 61 MARKED_SLOT (pre_write_conversion) | |
| 62 | |
| 63 /* If this coding system is not of the correct type for text file | |
| 64 conversion (i.e. decodes byte->char), we wrap it with appropriate | |
| 65 char<->byte converters. This is created dynamically, when it's | |
| 66 needed, and cached here. */ | |
| 67 MARKED_SLOT (text_file_wrapper) | |
| 68 | |
| 69 /* ------------------------ junk to handle EOL ------------------------- | |
| 70 I had hoped that we could handle this without lots of special-case | |
| 71 code, but it appears not to be the case if we want to maintain | |
| 72 compatibility with the existing way. However, at least with the way | |
| 73 we do things now, we avoid EOL junk in most of the coding system | |
| 74 methods themselves, or in the decode/encode functions. The EOL | |
| 75 special-case code is limited to coding-system creation and to the | |
| 76 convert-eol and undecided coding system types. */ | |
| 77 | |
| 78 /* If this coding system wants autodetection of the EOL type, then at the | |
| 79 appropriate time we wrap this coding system with | |
| 80 convert-eol-autodetect. (We do NOT do this at creation time because | |
| 81 then we end up with multiple convert-eols wrapped into the final | |
| 82 result -- esp. with autodetection using `undecided' -- leading to a | |
| 83 big mess.) We cache the wrapped coding system here. */ | |
| 84 MARKED_SLOT (auto_eol_wrapper) | |
| 85 | |
| 86 /* Subsidiary coding systems that specify a particular type of EOL | |
| 87 marking, rather than autodetecting it. These will only be non-nil | |
| 88 if (eol_type == EOL_AUTODETECT). These are chains. */ | |
| 89 MARKED_SLOT_ARRAY (eol, 3) | |
| 90 /* If this coding system is a subsidiary, this element points back to its | |
| 91 parent. */ | |
| 92 MARKED_SLOT (subsidiary_parent) | |
| 93 | |
| 94 /* At decoding or encoding time, we use the following coding system, if | |
| 95 it exists, in place of the coding system object. This is how we | |
| 96 handle coding systems with EOL types of CRLF or CR. Formerly, we did | |
| 97 the canonicalization at creation time, returning a chain in place of | |
| 98 the original coding system; but that interferes with | |
| 99 `coding-system-property' and causes other complications. CANONICAL is | |
| 100 used when determining the end types of a coding system. | |
| 101 canonicalize-after-coding also consults CANONICAL (it has to, because | |
| 102 the data in the lstream is based on CANONICAL, not on the original | |
| 103 coding system). */ | |
| 104 MARKED_SLOT (canonical) | |
| 105 | |
|
4568
1d74a1d115ee
Add #'query-coding-region tests; do the work necessary to get them running.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
106 MARKED_SLOT (safe_charsets) |
|
1d74a1d115ee
Add #'query-coding-region tests; do the work necessary to get them running.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
107 |
|
1d74a1d115ee
Add #'query-coding-region tests; do the work necessary to get them running.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
108 MARKED_SLOT (safe_chars) |
|
1d74a1d115ee
Add #'query-coding-region tests; do the work necessary to get them running.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
109 |
| 1204 | 110 #undef MARKED_SLOT |
| 111 #undef MARKED_SLOT_ARRAY | |
| 112 #undef CODING_SYSTEM_SLOT_DECLARATION |