Mercurial > hg > xemacs-beta

diff src/text.h @ 800:a5954632b187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children a634e3b7acc8
line wrap: on
line diff
--- a/src/text.h	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/text.h	Sun Mar 31 08:30:17 2002 +0000
@@ -83,7 +83,7 @@
 
 /* Number of bytes in the string representation of a character. */
 
-#ifdef ERROR_CHECK_TYPECHECK
+#ifdef ERROR_CHECK_TEXT
 
 INLINE_HEADER int REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file,
 					     int line);
@@ -97,11 +97,11 @@
 #define REP_BYTES_BY_FIRST_BYTE(fb) \
   REP_BYTES_BY_FIRST_BYTE_1 (fb, __FILE__, __LINE__) 
 
-#else /* ERROR_CHECK_TYPECHECK */
+#else /* ERROR_CHECK_TEXT */
 
 #define REP_BYTES_BY_FIRST_BYTE(fb) (rep_bytes_by_first_byte[fb])
 
-#endif /* ERROR_CHECK_TYPECHECK */
+#endif /* ERROR_CHECK_TEXT */
 
 /* Is this character represented by more than one byte in a string? */
 
@@ -260,7 +260,7 @@
 # define VALID_CHARPTR_P(ptr) 1
 #endif
 
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
 # define ASSERT_VALID_CHARPTR(ptr) assert (VALID_CHARPTR_P (ptr))
 #else
 # define ASSERT_VALID_CHARPTR(ptr)
@@ -283,7 +283,7 @@
   (ptr)--;				\
 } while (!VALID_CHARPTR_P (ptr))
 
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
 #define INC_CHARPTR(ptr) do {		\
   ASSERT_VALID_CHARPTR (ptr);		\
   REAL_INC_CHARPTR (ptr);		\
@@ -303,11 +303,11 @@
   (ptr) = (Intbyte *) dc_ptr2;			\
 } while (0)
 
-#else /* ! ERROR_CHECK_CHARBPOS */
+#else /* ! ERROR_CHECK_TEXT */
 #define INC_CHARBYTEBPOS(ptr, pos) REAL_INC_CHARBYTEBPOS (ptr, pos)
 #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr)
 #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr)
-#endif /* ! ERROR_CHECK_CHARBPOS */
+#endif /* ! ERROR_CHECK_TEXT */
 
 #ifdef MULE
 
@@ -1111,7 +1111,7 @@
   memcpy ((ei)->data_, data, (ei)->bytelen_);		\
 } while (0)
 
-#ifdef ERROR_CHECK_CHARBPOS
+#ifdef ERROR_CHECK_TEXT
 #define EI_ASSERT_ASCII(ptr, len)			\
 do {							\
   int ei5;						\
@@ -1349,17 +1349,17 @@
   Intbyte *pos = eistr->data_ + bytepos;
   int i;
 
-  charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
-  charbpos_checking_assert (n >= 0 && n <= eistr->charlen_);
+  text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
+  text_checking_assert (n >= 0 && n <= eistr->charlen_);
   /* We could check N more correctly now, but that would require a
      call to bytecount_to_charcount(), which would be needlessly
      expensive (it would convert O(N) algorithms into O(N^2) algorithms
-     with ERROR_CHECK_CHARBPOS, which would be bad).  If N is bad, we are
+     with ERROR_CHECK_TEXT, which would be bad).  If N is bad, we are
      guaranteed to catch it either inside INC_CHARPTR() or in the check
      below. */
   for (i = 0; i < n; i++)
     INC_CHARPTR (pos);
-  charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
+  text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
   return pos - eistr->data_;
 }
 
@@ -1373,12 +1373,12 @@
   Intbyte *pos = eistr->data_ + bytepos;
   int i;
 
-  charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
-  charbpos_checking_assert (n >= 0 && n <= eistr->charlen_);
+  text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
+  text_checking_assert (n >= 0 && n <= eistr->charlen_);
   /* We could check N more correctly now, but ...  see above. */
   for (i = 0; i < n; i++)
     DEC_CHARPTR (pos);
-  charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
+  text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
   return pos - eistr->data_;
 }