Mercurial > hg > xemacs-beta
view src/debug.c @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | ecf1ebac70d8 |
children | e0138eaaca0c |
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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* 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) { }