Mercurial > hg > xemacs-beta
annotate src/blocktype.c @ 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 |
|---|---|
| 428 | 1 /* Fixed-size block allocator. |
| 2 Copyright (C) 1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
665
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 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:
665
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:
665
diff
changeset
|
9 option) any later version. |
| 428 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 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:
665
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 /* Authorship: | |
| 22 | |
| 23 Ben Wing: December 1994, for 19.12. | |
| 24 */ | |
| 25 | |
| 26 /* | |
| 27 | |
| 28 ------------------------------------------------------------------------------ | |
| 29 | |
| 30 A "block-type object" is used to efficiently allocate and free blocks | |
| 31 of a particular size. Freed blocks are remembered in a free list and | |
| 32 are reused as necessary to allocate new blocks, so as to avoid as | |
| 33 much as possible making calls to malloc() and free(). | |
| 34 | |
| 35 This is a container object. Declare a block-type object of a specific type | |
| 36 as follows: | |
| 37 | |
| 38 struct mytype_blocktype { | |
| 39 Blocktype_declare (mytype); | |
| 40 }; | |
| 41 | |
| 42 Use the following functions/macros: | |
| 43 | |
| 44 structype *Blocktype_new(structype) | |
| 45 [MACRO] Create a new block-type object of the specified type. | |
| 46 The argument to this call should be the type of object to be | |
| 47 created, e.g. foobar_blocktype. | |
| 48 type *Blocktype_alloc(b) | |
| 49 [MACRO] Allocate a block of the proper type for the specified | |
| 50 block-type object and return a pointer to it. | |
| 51 Blocktype_free(b, block) | |
| 52 Free a block of the type corresponding to the specified block-type | |
| 53 object. | |
| 54 Blocktype_delete(b) | |
| 55 Destroy a block-type object and the memory allocated to it. | |
| 56 | |
| 57 */ | |
| 58 | |
| 59 /* This file has been Mule-ized. */ | |
| 60 | |
| 61 #include <config.h> | |
| 62 #include "lisp.h" | |
| 63 | |
| 64 #include "blocktype.h" | |
| 65 | |
| 66 typedef struct blocktype | |
| 67 { | |
| 68 Blocktype_declare (void); | |
| 69 } Blocktype; | |
| 70 | |
| 71 struct block_internal | |
| 72 { | |
| 73 void *next; | |
| 74 }; | |
| 75 | |
| 76 void * | |
| 665 | 77 Blocktype_newf (Bytecount elsize) |
| 428 | 78 { |
| 79 Blocktype *b = xnew (Blocktype); | |
| 665 | 80 b->elsize = max (elsize, (Bytecount) sizeof (void *)); |
| 428 | 81 b->free = 0; |
| 82 return (void *) b; | |
| 83 } | |
| 84 | |
| 85 void | |
| 86 Blocktype_allocf (void *bbb) | |
| 87 { | |
| 88 Blocktype *b = (Blocktype *) bbb; | |
| 89 if (b->free) | |
| 90 { | |
| 91 b->tempel = b->free; | |
| 92 b->free = ((struct block_internal *) (b->free))->next; | |
| 93 } | |
| 94 else | |
| 95 b->tempel = (void *) xmalloc (b->elsize); | |
| 96 } | |
| 97 | |
| 98 void | |
| 99 Blocktype_free (void *bbb, void *el) | |
| 100 { | |
| 101 Blocktype *b = (Blocktype *) bbb; | |
| 102 ((struct block_internal *) el)->next = b->free; | |
| 103 b->free = el; | |
| 104 } |