Mercurial > hg > xemacs-beta
annotate src/inline.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 /* Repository for inline functions |
| 2 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 5178 | 3 Copyright (C) 2010 Ben Wing. |
| 428 | 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:
5178
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 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:
5178
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:
5178
diff
changeset
|
10 option) any later version. |
| 428 | 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:
5178
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 22 /* The purpose of this file is so that there is at least one actual | |
| 23 definition of each inline function. This is needed under GCC. The | |
| 442 | 24 reason is that under GCC we declare our inline functions `inline |
| 25 extern', which causes the inlined version to get used only for | |
| 428 | 26 inlining, and in other cases to generate an external reference to |
| 27 the function. This is more efficient than declaring our inline | |
| 442 | 28 functions `inline static', which (in many cases) would cause a separate |
| 428 | 29 version of the function to get inserted into every source file that |
| 442 | 30 included the corresponding header file. See internals.texi. |
| 428 | 31 |
| 32 Some compilers that recognize `inline' may not do the same | |
| 442 | 33 `inline extern' business, so on those we just do `inline static'. |
| 428 | 34 */ |
| 35 | |
| 36 /* Note to maintainers: This file contains a list of all header files | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4677
diff
changeset
|
37 that use the INLINE macro, either directly, or by using DECLARE_LISP_OBJECT. |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4677
diff
changeset
|
38 i.e. the output of ``grep -l -w 'DECLARE_LISP_OBJECT|INLINE_HEADER' *.h'' */ |
| 428 | 39 |
| 442 | 40 #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS |
| 428 | 41 |
| 42 #include <config.h> | |
| 43 #include "lisp.h" | |
| 859 | 44 |
| 45 #include "sysfile.h" | |
| 46 | |
| 428 | 47 #include "buffer.h" |
| 48 #include "bytecode.h" | |
| 446 | 49 #include "casetab.h" |
| 428 | 50 #include "chartab.h" |
| 884 | 51 #include "device-impl.h" |
| 428 | 52 #include "elhash.h" |
| 53 #include "events.h" | |
| 884 | 54 #include "extents-impl.h" |
| 428 | 55 #include "faces.h" |
| 884 | 56 #include "frame-impl.h" |
| 428 | 57 #include "glyphs.h" |
| 442 | 58 #include "gui.h" |
| 428 | 59 #include "keymap.h" |
| 60 #include "lstream.h" | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
4916
diff
changeset
|
61 #include "fontcolor-impl.h" |
| 428 | 62 #include "opaque.h" |
| 63 #include "process.h" | |
| 64 #include "rangetab.h" | |
| 65 #include "specifier.h" | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3354
diff
changeset
|
66 #include "symeval.h" |
| 428 | 67 #include "syntax.h" |
| 68 #include "window.h" | |
| 69 | |
| 3050 | 70 /* If we demand !defined (HAVE_SHLIB) the INLINE_HEADERS aren't instantiated. |
| 71 This only shows up in --with-error-checking=types builds AFAIK. | |
| 72 On Mac OS X 10.3.9 with the Apple toolchain (GCC 3.3) gives a buildtime | |
| 73 link error (the lrecord error_check functions are undefined). | |
| 74 Debian GNU/Linux `sid' with GCC 4.0.3 prerelease & binutils 2.16.91 gives | |
| 75 a runtime link error (the lrecord error_check functions are undefined). | |
| 76 It is possible that this can be fixed trickily by appropriately defining | |
| 77 INLINE, or that it should be done in the module itself somehow. If you | |
| 78 can do it better or more elegantly, please feel free to consult me. | |
| 79 --stephen 2005-11-07 */ | |
| 80 #if defined (HAVE_LDAP) | |
| 996 | 81 #include "../modules/ldap/eldap.h" |
| 428 | 82 #endif |
| 83 | |
| 3050 | 84 /* We can't ask for !defined (HAVE_SHLIB). See HAVE_LDAP, above. */ |
| 85 #if defined (HAVE_POSTGRESQL) | |
| 996 | 86 #include "../modules/postgresql/postgresql.h" |
| 442 | 87 #endif |
| 88 | |
| 428 | 89 #ifdef HAVE_TOOLBARS |
| 90 #include "toolbar.h" | |
| 91 #endif | |
| 92 | |
| 617 | 93 #ifdef HAVE_SCROLLBARS |
| 94 #include "scrollbar.h" | |
| 95 #endif | |
| 96 | |
| 428 | 97 #ifdef HAVE_DATABASE |
| 98 #include "database.h" | |
| 99 #endif | |
| 100 | |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
101 #include "console-stream-impl.h" |
|
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
102 |
| 428 | 103 #ifdef HAVE_X_WINDOWS |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
104 #include "console-x-impl.h" |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4677
diff
changeset
|
105 #ifdef HAVE_XFT |
| 3354 | 106 #include "font-mgr.h" |
| 3094 | 107 #endif |
| 428 | 108 #endif |
| 109 | |
| 442 | 110 #ifdef HAVE_MS_WINDOWS |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
111 #include "console-msw-impl.h" |
|
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
112 #endif |
|
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
113 |
|
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
114 #ifdef HAVE_TTY |
|
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
115 #include "console-tty-impl.h" |
| 5178 | 116 #include "fontcolor-tty-impl.h" |
| 442 | 117 #endif |
| 118 | |
| 462 | 119 #ifdef HAVE_GTK |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
120 #include "console-gtk-impl.h" |
| 462 | 121 #include "ui-gtk.h" |
| 122 #endif | |
| 123 | |
| 428 | 124 #include "file-coding.h" |
| 125 | |
| 126 #ifdef TOOLTALK | |
| 127 #include "tooltalk.h" | |
| 128 #endif |
