comparison src/lrecord.h @ 788:026c5bf9c134

[xemacs-hg @ 2002-03-21 07:29:57 by ben] chartab.c: Fix bugs in implementation and doc strings. config.h.in: Add foo_checking_assert_at_line() macros. Not clear whether these are actually useful, though; I'll take them out if not. symsinit.h, emacs.c: Some improvements to the timeline. Rearrange a bit the init calls. Add call for reinit_vars_of_object_mswindows() and declare in symsinit.h. event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, events.h: Introduce new event methods for printing, comparing, and hashing magic events, to avoid event-type-specific stuff that had crept into events.c. (And was crashing, since the channel in MS Windows magic events may be nil.) Implement the methods in event-{tty,gtk,Xt,mswindows}.c. Make wrapping functions event_stream_{compare,hash,format}_magic_event() to check if everything's OK and call the actual callback. Fix events.c to use the new methods. Add a new event-stream-operation EVENT_STREAM_NOTHING -- event stream not actually required to be able to do anything, just be open. (#### This event-stream-operation stuff needs to be rethought.) Fixed describe_event() in event-Xt.c to print its output to a stream, not always to stderr, so it can be used elsewhere. (e.g. in print-event when a magic event is encountered?) lisp.h, lrecord.h: Define new assert_at_line(), for use in asserts inside of inline functions. The assert will report the line and file of the inline function, which is almost certainly not what you want as it's useless. what you want to see is where the pseudo-macro was called from. So, when error-checking is on, we pass in the line and file into the macros, for accurate printout using assert_at_line(). Happens only when error-checking is defined so doesn't slow down non-error-checking builds. Fix XCHAR, XINT, XCHAR_OR_INT, XFOO, and wrap_foo() in this fashion. lstream.c, lstream.h: Add resizing_buffer_to_lisp_string(). objects-gtk.c: Fix typo. objects-msw.c: Implement a smarter way of determining whether a font matches a charset. Formerly we just looked at the "script" element of the font spec, converted it to a code page, and compared it with the code page derived from the charset. Now, as well as doing this, we ask the font for the list of unicode ranges it supports, see what range the charset falls into (#### bogus! need to do this char-by-char), and see if any of the font's supported ranges include the charset's range. also do some caching in Vfont_signature_data of previous inquiries. charset.h, text.c, mule-charset.c: New fun; extracted out of Fmake_char() and declare prototype in charset.h. text.h: introduce assert_by_line() to make REP_BYTES_BY_FIRST_BYTE report the file and line more accurately in an assertion failure. unicode.c: make non-static (used in objects-msw.c), declare in charset.h. mule\mule-category.el: Start implementing a category API compatible with FSF. Not there yet. We need improvements to char-tables. mule\mule-charset.el: Copy translation table code from FSF 21.1 and fix up. Eventually we'll have them in XEmacs. (used in ccl) Not here quite yet, and we need some improvements to char-tables. mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\ethio-util.el, mule\korea-util.el, mule\mule-tty-init.el, mule\tibet-util.el, mule\viet-util.el, mule\vietnamese.el: Fix numerous compilation warnings. Fix up code related to translation tables and other types of char-tables. menubar-items.el: Move the frame commands from the View menu to the File menu, to be consistent with how most other programs do things. Move less-used revert/recover items to a submenu. Make "recover" not prompt for a file, but recover the current buffer. TODO.ben-mule-21-5: Create bug list for latest problems.
author ben
date Thu, 21 Mar 2002 07:31:30 +0000
parents 943eaba38521
children e38acbeb1cae
comparison
equal deleted inserted replaced
787:242b62e9fc59 788:026c5bf9c134
1 /* The "lrecord" structure (header of a compound lisp object). 1 /* The "lrecord" structure (header of a compound lisp object).
2 Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1996, 2001 Ben Wing. 3 Copyright (C) 1996, 2001, 2002 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
748 */ 748 */
749 749
750 750
751 #ifdef ERROR_CHECK_TYPECHECK 751 #ifdef ERROR_CHECK_TYPECHECK
752 752
753 # define DECLARE_LRECORD(c_name, structtype) \ 753 # define DECLARE_LRECORD(c_name, structtype) \
754 extern const struct lrecord_implementation lrecord_##c_name; \ 754 extern const struct lrecord_implementation lrecord_##c_name; \
755 INLINE_HEADER structtype * \ 755 INLINE_HEADER structtype * \
756 error_check_##c_name (Lisp_Object obj); \ 756 error_check_##c_name (Lisp_Object obj, const char *file, int line); \
757 INLINE_HEADER structtype * \ 757 INLINE_HEADER structtype * \
758 error_check_##c_name (Lisp_Object obj) \ 758 error_check_##c_name (Lisp_Object obj, const char *file, int line) \
759 { \ 759 { \
760 assert (RECORD_TYPEP (obj, lrecord_type_##c_name)); \ 760 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \
761 return (structtype *) XPNTR (obj); \ 761 return (structtype *) XPNTR (obj); \
762 } \ 762 } \
763 extern Lisp_Object Q##c_name##p 763 extern Lisp_Object Q##c_name##p
764 764
765 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype) \ 765 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype) \
766 extern int lrecord_type_##c_name; \ 766 extern int lrecord_type_##c_name; \
767 extern struct lrecord_implementation lrecord_##c_name; \ 767 extern struct lrecord_implementation lrecord_##c_name; \
768 INLINE_HEADER structtype * \ 768 INLINE_HEADER structtype * \
769 error_check_##c_name (Lisp_Object obj); \ 769 error_check_##c_name (Lisp_Object obj, const char *file, int line); \
770 INLINE_HEADER structtype * \ 770 INLINE_HEADER structtype * \
771 error_check_##c_name (Lisp_Object obj) \ 771 error_check_##c_name (Lisp_Object obj, const char *file, int line) \
772 { \ 772 { \
773 assert (RECORD_TYPEP (obj, lrecord_type_##c_name)); \ 773 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \
774 return (structtype *) XPNTR (obj); \ 774 return (structtype *) XPNTR (obj); \
775 } \ 775 } \
776 extern Lisp_Object Q##c_name##p 776 extern Lisp_Object Q##c_name##p
777 777
778 # define DECLARE_NONRECORD(c_name, type_enum, structtype) \ 778 # define DECLARE_NONRECORD(c_name, type_enum, structtype) \
779 INLINE_HEADER structtype * \ 779 INLINE_HEADER structtype * \
780 error_check_##c_name (Lisp_Object obj); \ 780 error_check_##c_name (Lisp_Object obj, const char *file, int line); \
781 INLINE_HEADER structtype * \ 781 INLINE_HEADER structtype * \
782 error_check_##c_name (Lisp_Object obj) \ 782 error_check_##c_name (Lisp_Object obj, const char *file, int line) \
783 { \ 783 { \
784 assert (XTYPE (obj) == type_enum); \ 784 assert_at_line (XTYPE (obj) == type_enum, file, line); \
785 return (structtype *) XPNTR (obj); \ 785 return (structtype *) XPNTR (obj); \
786 } \ 786 } \
787 extern Lisp_Object Q##c_name##p 787 extern Lisp_Object Q##c_name##p
788 788
789 # define XRECORD(x, c_name, structtype) error_check_##c_name (x) 789 # define XRECORD(x, c_name, structtype) \
790 # define XNONRECORD(x, c_name, type_enum, structtype) error_check_##c_name (x) 790 error_check_##c_name (x, __FILE__, __LINE__)
791 # define XNONRECORD(x, c_name, type_enum, structtype) \
792 error_check_##c_name (x, __FILE__, __LINE__)
791 793
792 # define XSETRECORD(var, p, c_name) do \ 794 # define XSETRECORD(var, p, c_name) do \
793 { \ 795 { \
794 XSETOBJ (var, p); \ 796 XSETOBJ (var, p); \
795 assert (RECORD_TYPEP (var, lrecord_type_##c_name)); \ 797 assert (RECORD_TYPEP (var, lrecord_type_##c_name)); \
796 } while (0) 798 } while (0)
797 799
798 INLINE_HEADER Lisp_Object wrap_record_1 (void *ptr, enum lrecord_type ty); 800 INLINE_HEADER Lisp_Object wrap_record_1 (void *ptr, enum lrecord_type ty,
801 const char *file, int line);
799 INLINE_HEADER Lisp_Object 802 INLINE_HEADER Lisp_Object
800 wrap_record_1 (void *ptr, enum lrecord_type ty) 803 wrap_record_1 (void *ptr, enum lrecord_type ty, const char *file, int line)
801 { 804 {
802 Lisp_Object obj; 805 Lisp_Object obj;
803 XSETOBJ (obj, ptr); 806 XSETOBJ (obj, ptr);
804 assert (RECORD_TYPEP (obj, ty)); 807 assert_at_line (RECORD_TYPEP (obj, ty), file, line);
805 return obj; 808 return obj;
806 } 809 }
807 810
808 #define wrap_record(ptr, ty) wrap_record_1 (ptr, lrecord_type_##ty) 811 #define wrap_record(ptr, ty) \
812 wrap_record_1 (ptr, lrecord_type_##ty, __FILE__, __LINE__)
809 813
810 #else /* not ERROR_CHECK_TYPECHECK */ 814 #else /* not ERROR_CHECK_TYPECHECK */
811 815
812 # define DECLARE_LRECORD(c_name, structtype) \ 816 # define DECLARE_LRECORD(c_name, structtype) \
813 extern Lisp_Object Q##c_name##p; \ 817 extern Lisp_Object Q##c_name##p; \