Mercurial > hg > xemacs-beta
annotate src/widget.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 /* Primitives for work of the "widget" library. |
| 2 Copyright (C) 1997 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:
4693
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:
4693
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:
4693
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:
4693
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 /* In an ideal world, this file would not have been necessary. | |
| 22 However, elisp function calls being as slow as they are, it turns | |
| 23 out that some functions in the widget library (wid-edit.el) are the | |
| 24 bottleneck of Widget operation. Here is their translation to C, | |
| 25 for the sole reason of efficiency. */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 29 #include "buffer.h" | |
| 30 | |
| 31 | |
| 32 Lisp_Object Qwidget_type; | |
| 33 | |
| 34 | |
| 35 DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* | |
| 36 Like `plist-get', but returns the tail of PLIST whose car is PROP. | |
| 37 */ | |
| 38 (plist, prop)) | |
| 39 { | |
| 40 while (!NILP (plist) && !EQ (Fcar (plist), prop)) | |
| 41 { | |
| 42 /* Check for QUIT, so a circular plist doesn't lock up the | |
| 43 editor. */ | |
| 44 QUIT; | |
| 45 plist = Fcdr (Fcdr (plist)); | |
| 46 } | |
| 47 return plist; | |
| 48 } | |
| 49 | |
| 50 DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* | |
| 51 In WIDGET set PROPERTY to VALUE. | |
| 52 The value can later be retrieved with `widget-get'. | |
| 53 */ | |
| 54 (widget, property, value)) | |
| 55 { | |
| 56 CHECK_CONS (widget); | |
| 57 XCDR (widget) = Fplist_put (XCDR (widget), property, value); | |
| 58 return widget; | |
| 59 } | |
| 60 | |
| 61 DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* | |
| 62 In WIDGET, get the value of PROPERTY. | |
| 63 The value could either be specified when the widget was created, or | |
| 64 later with `widget-put'. | |
| 65 */ | |
| 66 (widget, property)) | |
| 67 { | |
| 68 Lisp_Object value = Qnil; | |
| 69 | |
| 70 while (1) | |
| 71 { | |
| 72 Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); | |
| 73 if (!NILP (tmp)) | |
| 74 { | |
| 75 value = Fcar (Fcdr (tmp)); | |
| 76 break; | |
| 77 } | |
| 78 tmp = Fcar (widget); | |
| 79 if (!NILP (tmp)) | |
| 80 { | |
| 81 widget = Fget (tmp, Qwidget_type, Qnil); | |
| 82 continue; | |
| 83 } | |
| 84 break; | |
| 85 } | |
| 86 return value; | |
| 87 } | |
| 88 | |
| 89 DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* | |
| 90 Apply the value of WIDGET's PROPERTY to the widget itself. | |
| 91 ARGS are passed as extra arguments to the function. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
92 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
93 arguments: (WIDGET PROPERTY &rest ARGS) |
| 428 | 94 */ |
| 95 (int nargs, Lisp_Object *args)) | |
| 96 { | |
| 97 /* This function can GC */ | |
| 98 Lisp_Object newargs[3]; | |
| 99 struct gcpro gcpro1; | |
| 100 | |
| 101 newargs[0] = Fwidget_get (args[0], args[1]); | |
| 102 newargs[1] = args[0]; | |
| 103 newargs[2] = Flist (nargs - 2, args + 2); | |
| 434 | 104 GCPRO1 (newargs[2]); |
| 428 | 105 RETURN_UNGCPRO (Fapply (3, newargs)); |
| 106 } | |
| 107 | |
| 108 void | |
| 109 syms_of_widget (void) | |
| 110 { | |
| 563 | 111 DEFSYMBOL (Qwidget_type); |
| 428 | 112 |
| 113 DEFSUBR (Fwidget_plist_member); | |
| 114 DEFSUBR (Fwidget_put); | |
| 115 DEFSUBR (Fwidget_get); | |
| 116 DEFSUBR (Fwidget_apply); | |
| 117 } |