Mercurial > hg > xemacs-beta
view src/debug.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 | 56144c8593a8 |
line wrap: on
line source
/* Debugging aids -- togglable assertions. Copyright (C) 1994 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* This file has been Mule-ized. */ /* Written by Chuck Thompson */ #include <config.h> #include "lisp.h" #include "debug.h" #include "bytecode.h" /* * To add a new debug class: * 1. Add a symbol definition for it here or in general-slots.h, if one * doesn't exist elsewhere. If you add it here, make sure to add a * defsymbol line for it in syms_of_debug. * 2. Add an extern definition for the symbol to debug.h. * 3. Add entries for the class to struct debug_classes in debug.h. * 4. Add a FROB line for it in xemacs_debug_loop. */ struct debug_classes active_debug_classes; enum debug_loop { X_ADD, X_DELETE, X_LIST, X_ACTIVE, X_INIT, X_VALIDATE, X_TYPE, X_SETTYPE }; static Lisp_Object xemacs_debug_loop (enum debug_loop op, Lisp_Object class_, Lisp_Object type) { int flag = (op == X_ADD) ? 1 : 0; Lisp_Object retval = Qnil; #define FROB(item) \ if (op == X_LIST || op == X_ACTIVE || op == X_INIT || EQ (class_, Q##item)) \ { \ if (op == X_ADD || op == X_DELETE || op == X_INIT) \ active_debug_classes.item = flag; \ else if (op == X_LIST \ || (op == X_ACTIVE && active_debug_classes.item)) \ retval = Fcons (Q##item, retval); \ else if (op == X_VALIDATE) \ return Qt; \ else if (op == X_SETTYPE) \ active_debug_classes.types_of_##item = XINT (type); \ else if (op == X_TYPE) \ retval = make_int (active_debug_classes.types_of_##item); \ if (op == X_INIT) active_debug_classes.types_of_##item = VALBITS; \ } FROB (redisplay); FROB (buffers); FROB (extents); FROB (faces); FROB (windows); FROB (frames); FROB (devices); FROB (byte_code); return retval; #undef FROB } DEFUN ("add-debug-class-to-check", Fadd_debug_class_to_check, 1, 1, 0, /* Add a debug class to the list of active classes. */ (class_)) { if (NILP (xemacs_debug_loop (X_VALIDATE, class_, Qnil))) invalid_argument ("No such debug class exists", Qunbound); else xemacs_debug_loop (X_ADD, class_, Qnil); return (xemacs_debug_loop (X_ACTIVE, Qnil, Qnil)); } DEFUN ("delete-debug-class-to-check", Fdelete_debug_class_to_check, 1, 1, 0, /* Delete a debug class from the list of active classes. */ (class_)) { if (NILP (xemacs_debug_loop (X_VALIDATE, class_, Qnil))) invalid_argument ("No such debug class exists", Qunbound); else xemacs_debug_loop (X_DELETE, class_, Qnil); return (xemacs_debug_loop (X_ACTIVE, Qnil, Qnil)); } DEFUN ("debug-classes-being-checked", Fdebug_classes_being_checked, 0, 0, 0, /* Return a list of active debug classes. */ ()) { return (xemacs_debug_loop (X_ACTIVE, Qnil, Qnil)); } DEFUN ("debug-classes-list", Fdebug_classes_list, 0, 0, 0, /* Return a list of all defined debug classes. */ ()) { return (xemacs_debug_loop (X_LIST, Qnil, Qnil)); } DEFUN ("set-debug-classes-to-check", Fset_debug_classes_to_check, 1, 1, 0, /* Set which classes of debug statements should be active. CLASSES should be a list of debug classes. */ (classes)) { Lisp_Object rest; CHECK_LIST (classes); /* Make sure all objects in the list are valid. If anyone is not valid, reject the entire list without doing anything. */ LIST_LOOP (rest, classes) { if (NILP (xemacs_debug_loop (X_VALIDATE, XCAR (rest), Qnil))) sferror ("Invalid object in class list", Qunbound); } LIST_LOOP (rest, classes) Fadd_debug_class_to_check (XCAR (rest)); return (xemacs_debug_loop (X_ACTIVE, Qnil, Qnil)); } DEFUN ("set-debug-class-types-to-check", Fset_debug_class_types_to_check, 2, 2, 0, /* For the given debug CLASS, set which TYPES are actually interesting. TYPES should be an integer representing the or'd value of all desired types. Lists of defined types and their values are located in the source code. */ (class_, type)) { CHECK_INT (type); if (NILP (xemacs_debug_loop (X_VALIDATE, class_, Qnil))) invalid_argument ("Invalid debug class", Qunbound); xemacs_debug_loop (X_SETTYPE, class_, type); return (xemacs_debug_loop (X_TYPE, class_, Qnil)); } DEFUN ("debug-types-being-checked", Fdebug_types_being_checked, 1, 1, 0, /* For the given CLASS, return the associated type value. */ (class_)) { if (NILP (xemacs_debug_loop (X_VALIDATE, class_, Qnil))) invalid_argument ("Invalid debug class", Qunbound); return (xemacs_debug_loop (X_TYPE, class_, Qnil)); } void syms_of_debug (void) { DEFSUBR (Fadd_debug_class_to_check); DEFSUBR (Fdelete_debug_class_to_check); DEFSUBR (Fdebug_classes_being_checked); DEFSUBR (Fdebug_classes_list); DEFSUBR (Fset_debug_classes_to_check); DEFSUBR (Fset_debug_class_types_to_check); DEFSUBR (Fdebug_types_being_checked); } void reinit_vars_of_debug (void) { /* If you need to have any classes active early on in startup, then the flags should be set here. All functions called by this function are "allowed" according to emacs.c. */ xemacs_debug_loop (X_INIT, Qnil, Qnil); } void vars_of_debug (void) { Fprovide (intern ("debug-xemacs")); }
