[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.

--- a/src/lisp.h	Wed Mar 20 10:21:23 2002 +0000
+++ b/src/lisp.h	Thu Mar 21 07:31:30 2002 +0000
@@ -417,9 +417,12 @@
    time the assert checks take is measurable so let's not include them
    in production binaries.
 
-   assert() returns 1 if the assert succeeded (or wasn't tried), 0 if
-   failed. (Normally, it would have aborted here, but with
-   ASSERTIONS_DONT_ABORT defined, it will continue. */
+   If ASSERTIONS_DONT_ABORT defined, we will continue after assertion
+   failures.
+
+   assert_at_line() is used for asserts inside of inline functions called
+   from error-checking macros.  If we're not tricky, we just get the file
+   and line of the inline function, which is not very useful. */
 
 #ifdef USE_ASSERTIONS
 /* Highly dubious kludge */
@@ -427,11 +430,15 @@
 void assert_failed (const char *, int, const char *);
 # define abort() (assert_failed (__FILE__, __LINE__, "abort()"))
 # define assert(x) ((x) ? (void) 0 : assert_failed (__FILE__, __LINE__, #x))
+# define assert_at_line(x, file, line) \
+  ((x) ? (void) 0 : assert_failed (file, line, #x))
 #else
 # ifdef DEBUG_XEMACS
 #  define assert(x) ((x) ? (void) 0 : (void) abort ())
+#  define assert_at_line(x, file, line) assert (x)
 # else
 #  define assert(x) ((void) 0)
+#  define assert_at_line(x, file, line) assert (x)
 # endif
 #endif
 
@@ -1733,19 +1740,21 @@
 
 #ifdef ERROR_CHECK_TYPECHECK
 
-INLINE_HEADER Emchar XCHAR (Lisp_Object obj);
+INLINE_HEADER Emchar XCHAR_1 (Lisp_Object obj, const char *file, int line);
 INLINE_HEADER Emchar
-XCHAR (Lisp_Object obj)
+XCHAR_1 (Lisp_Object obj, const char *file, int line)
 {
-  assert (CHARP (obj));
+  assert_at_line (CHARP (obj), file, line);
   return XCHARVAL (obj);
 }
 
-#else
-
-#define XCHAR(x) ((Emchar)XCHARVAL (x))
-
-#endif
+#define XCHAR(x) XCHAR_1 (x, __FILE__, __LINE__) 
+
+#else /* no error checking */
+
+#define XCHAR(x) ((Emchar) XCHARVAL (x))
+
+#endif /* no error checking */
 
 #define CHECK_CHAR(x) CHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp)
 #define CONCHECK_CHAR(x) CONCHECK_NONRECORD (x, Lisp_Type_Char, Qcharacterp)
@@ -1813,19 +1822,23 @@
 
 #ifdef ERROR_CHECK_TYPECHECK
 
-INLINE_HEADER EMACS_INT XINT (Lisp_Object obj);
+#define XCHAR_OR_INT(x) XCHAR_OR_INT_1 (x, __FILE__, __LINE__) 
+#define XINT(x) XINT_1 (x, __FILE__, __LINE__) 
+
+INLINE_HEADER EMACS_INT XINT_1 (Lisp_Object obj, const char *file, int line);
 INLINE_HEADER EMACS_INT
-XINT (Lisp_Object obj)
+XINT_1 (Lisp_Object obj, const char *file, int line)
 {
-  assert (INTP (obj));
+  assert_at_line (INTP (obj), file, line);
   return XREALINT (obj);
 }
 
-INLINE_HEADER EMACS_INT XCHAR_OR_INT (Lisp_Object obj);
+INLINE_HEADER EMACS_INT XCHAR_OR_INT_1 (Lisp_Object obj, const char *file,
+					int line);
 INLINE_HEADER EMACS_INT
-XCHAR_OR_INT (Lisp_Object obj)
+XCHAR_OR_INT_1 (Lisp_Object obj, const char *file, int line)
 {
-  assert (INTP (obj) || CHARP (obj));
+  assert_at_line (INTP (obj) || CHARP (obj), file, line);
   return CHARP (obj) ? XCHAR (obj) : XINT (obj);
 }