Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
799:03d9f9084848 800:a5954632b187
81 but it's faster this way. */ 81 but it's faster this way. */
82 extern const Bytecount rep_bytes_by_first_byte[0xA0]; 82 extern const Bytecount rep_bytes_by_first_byte[0xA0];
83 83
84 /* Number of bytes in the string representation of a character. */ 84 /* Number of bytes in the string representation of a character. */
85 85
86 #ifdef ERROR_CHECK_TYPECHECK 86 #ifdef ERROR_CHECK_TEXT
87 87
88 INLINE_HEADER int REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file, 88 INLINE_HEADER int REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file,
89 int line); 89 int line);
90 INLINE_HEADER int 90 INLINE_HEADER int
91 REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file, int line) 91 REP_BYTES_BY_FIRST_BYTE_1 (int fb, const char *file, int line)
95 } 95 }
96 96
97 #define REP_BYTES_BY_FIRST_BYTE(fb) \ 97 #define REP_BYTES_BY_FIRST_BYTE(fb) \
98 REP_BYTES_BY_FIRST_BYTE_1 (fb, __FILE__, __LINE__) 98 REP_BYTES_BY_FIRST_BYTE_1 (fb, __FILE__, __LINE__)
99 99
100 #else /* ERROR_CHECK_TYPECHECK */ 100 #else /* ERROR_CHECK_TEXT */
101 101
102 #define REP_BYTES_BY_FIRST_BYTE(fb) (rep_bytes_by_first_byte[fb]) 102 #define REP_BYTES_BY_FIRST_BYTE(fb) (rep_bytes_by_first_byte[fb])
103 103
104 #endif /* ERROR_CHECK_TYPECHECK */ 104 #endif /* ERROR_CHECK_TEXT */
105 105
106 /* Is this character represented by more than one byte in a string? */ 106 /* Is this character represented by more than one byte in a string? */
107 107
108 #define CHAR_MULTIBYTE_P(c) ((c) >= 0x80) 108 #define CHAR_MULTIBYTE_P(c) ((c) >= 0x80)
109 109
258 # define VALID_CHARPTR_P(ptr) INTBYTE_FIRST_BYTE_P (* (unsigned char *) ptr) 258 # define VALID_CHARPTR_P(ptr) INTBYTE_FIRST_BYTE_P (* (unsigned char *) ptr)
259 #else 259 #else
260 # define VALID_CHARPTR_P(ptr) 1 260 # define VALID_CHARPTR_P(ptr) 1
261 #endif 261 #endif
262 262
263 #ifdef ERROR_CHECK_CHARBPOS 263 #ifdef ERROR_CHECK_TEXT
264 # define ASSERT_VALID_CHARPTR(ptr) assert (VALID_CHARPTR_P (ptr)) 264 # define ASSERT_VALID_CHARPTR(ptr) assert (VALID_CHARPTR_P (ptr))
265 #else 265 #else
266 # define ASSERT_VALID_CHARPTR(ptr) 266 # define ASSERT_VALID_CHARPTR(ptr)
267 #endif 267 #endif
268 268
281 281
282 #define REAL_DEC_CHARPTR(ptr) do { \ 282 #define REAL_DEC_CHARPTR(ptr) do { \
283 (ptr)--; \ 283 (ptr)--; \
284 } while (!VALID_CHARPTR_P (ptr)) 284 } while (!VALID_CHARPTR_P (ptr))
285 285
286 #ifdef ERROR_CHECK_CHARBPOS 286 #ifdef ERROR_CHECK_TEXT
287 #define INC_CHARPTR(ptr) do { \ 287 #define INC_CHARPTR(ptr) do { \
288 ASSERT_VALID_CHARPTR (ptr); \ 288 ASSERT_VALID_CHARPTR (ptr); \
289 REAL_INC_CHARPTR (ptr); \ 289 REAL_INC_CHARPTR (ptr); \
290 } while (0) 290 } while (0)
291 291
301 assert (dc_ptr1 - dc_ptr2 == \ 301 assert (dc_ptr1 - dc_ptr2 == \
302 REP_BYTES_BY_FIRST_BYTE (*dc_ptr2)); \ 302 REP_BYTES_BY_FIRST_BYTE (*dc_ptr2)); \
303 (ptr) = (Intbyte *) dc_ptr2; \ 303 (ptr) = (Intbyte *) dc_ptr2; \
304 } while (0) 304 } while (0)
305 305
306 #else /* ! ERROR_CHECK_CHARBPOS */ 306 #else /* ! ERROR_CHECK_TEXT */
307 #define INC_CHARBYTEBPOS(ptr, pos) REAL_INC_CHARBYTEBPOS (ptr, pos) 307 #define INC_CHARBYTEBPOS(ptr, pos) REAL_INC_CHARBYTEBPOS (ptr, pos)
308 #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr) 308 #define INC_CHARPTR(ptr) REAL_INC_CHARPTR (ptr)
309 #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr) 309 #define DEC_CHARPTR(ptr) REAL_DEC_CHARPTR (ptr)
310 #endif /* ! ERROR_CHECK_CHARBPOS */ 310 #endif /* ! ERROR_CHECK_TEXT */
311 311
312 #ifdef MULE 312 #ifdef MULE
313 313
314 /* Note that this reads the byte at *PTR! */ 314 /* Note that this reads the byte at *PTR! */
315 315
1109 do { \ 1109 do { \
1110 EI_ALLOC (ei, bytelen, charlen, 1); \ 1110 EI_ALLOC (ei, bytelen, charlen, 1); \
1111 memcpy ((ei)->data_, data, (ei)->bytelen_); \ 1111 memcpy ((ei)->data_, data, (ei)->bytelen_); \
1112 } while (0) 1112 } while (0)
1113 1113
1114 #ifdef ERROR_CHECK_CHARBPOS 1114 #ifdef ERROR_CHECK_TEXT
1115 #define EI_ASSERT_ASCII(ptr, len) \ 1115 #define EI_ASSERT_ASCII(ptr, len) \
1116 do { \ 1116 do { \
1117 int ei5; \ 1117 int ei5; \
1118 const Char_ASCII *ei5ptr = (ptr); \ 1118 const Char_ASCII *ei5ptr = (ptr); \
1119 int ei5len = (len); \ 1119 int ei5len = (len); \
1347 Charcount n)) 1347 Charcount n))
1348 { 1348 {
1349 Intbyte *pos = eistr->data_ + bytepos; 1349 Intbyte *pos = eistr->data_ + bytepos;
1350 int i; 1350 int i;
1351 1351
1352 charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); 1352 text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
1353 charbpos_checking_assert (n >= 0 && n <= eistr->charlen_); 1353 text_checking_assert (n >= 0 && n <= eistr->charlen_);
1354 /* We could check N more correctly now, but that would require a 1354 /* We could check N more correctly now, but that would require a
1355 call to bytecount_to_charcount(), which would be needlessly 1355 call to bytecount_to_charcount(), which would be needlessly
1356 expensive (it would convert O(N) algorithms into O(N^2) algorithms 1356 expensive (it would convert O(N) algorithms into O(N^2) algorithms
1357 with ERROR_CHECK_CHARBPOS, which would be bad). If N is bad, we are 1357 with ERROR_CHECK_TEXT, which would be bad). If N is bad, we are
1358 guaranteed to catch it either inside INC_CHARPTR() or in the check 1358 guaranteed to catch it either inside INC_CHARPTR() or in the check
1359 below. */ 1359 below. */
1360 for (i = 0; i < n; i++) 1360 for (i = 0; i < n; i++)
1361 INC_CHARPTR (pos); 1361 INC_CHARPTR (pos);
1362 charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_); 1362 text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
1363 return pos - eistr->data_; 1363 return pos - eistr->data_;
1364 } 1364 }
1365 1365
1366 #define eiincpos (ei, bytepos) eiincpos_1 (ei, bytepos, 1) 1366 #define eiincpos (ei, bytepos) eiincpos_1 (ei, bytepos, 1)
1367 #define eiincpos_n (ei, bytepos, n) eiincpos_1 (ei, bytepos, n) 1367 #define eiincpos_n (ei, bytepos, n) eiincpos_1 (ei, bytepos, n)
1371 Charcount n)) 1371 Charcount n))
1372 { 1372 {
1373 Intbyte *pos = eistr->data_ + bytepos; 1373 Intbyte *pos = eistr->data_ + bytepos;
1374 int i; 1374 int i;
1375 1375
1376 charbpos_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_); 1376 text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
1377 charbpos_checking_assert (n >= 0 && n <= eistr->charlen_); 1377 text_checking_assert (n >= 0 && n <= eistr->charlen_);
1378 /* We could check N more correctly now, but ... see above. */ 1378 /* We could check N more correctly now, but ... see above. */
1379 for (i = 0; i < n; i++) 1379 for (i = 0; i < n; i++)
1380 DEC_CHARPTR (pos); 1380 DEC_CHARPTR (pos);
1381 charbpos_checking_assert (pos - eistr->data_ <= eistr->bytelen_); 1381 text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
1382 return pos - eistr->data_; 1382 return pos - eistr->data_;
1383 } 1383 }
1384 1384
1385 #define eidecpos (ei, bytepos) eidecpos_1 (ei, bytepos, 1) 1385 #define eidecpos (ei, bytepos) eidecpos_1 (ei, bytepos, 1)
1386 #define eidecpos_n (ei, bytepos, n) eidecpos_1 (ei, bytepos, n) 1386 #define eidecpos_n (ei, bytepos, n) eidecpos_1 (ei, bytepos, n)