comparison src/buffer.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents a634e3b7acc8
children 2b6fa2618f76
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
234 #include "bufslots.h" 234 #include "bufslots.h"
235 235
236 mark_object (buf->extent_info); 236 mark_object (buf->extent_info);
237 if (buf->text) 237 if (buf->text)
238 mark_object (buf->text->line_number_cache); 238 mark_object (buf->text->line_number_cache);
239 mark_buffer_syntax_cache (buf);
239 240
240 /* Don't mark normally through the children slot. 241 /* Don't mark normally through the children slot.
241 (Actually, in this case, it doesn't matter.) */ 242 (Actually, in this case, it doesn't matter.) */
242 if (! EQ (buf->indirect_children, Qnull_pointer)) 243 if (! EQ (buf->indirect_children, Qnull_pointer))
243 mark_conses_in_list (buf->indirect_children); 244 mark_conses_in_list (buf->indirect_children);
256 printing_unreadable_object ("#<killed buffer>"); 257 printing_unreadable_object ("#<killed buffer>");
257 else 258 else
258 printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name)); 259 printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name));
259 } 260 }
260 else if (!BUFFER_LIVE_P (b)) 261 else if (!BUFFER_LIVE_P (b))
261 write_c_string ("#<killed buffer>", printcharfun); 262 write_c_string (printcharfun, "#<killed buffer>");
262 else if (escapeflag) 263 else if (escapeflag)
263 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name); 264 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name);
264 else 265 else
265 print_internal (b->name, printcharfun, 0); 266 print_internal (b->name, printcharfun, 0);
266 } 267 }
556 b->directory = current_buffer ? current_buffer->directory : Qnil; 557 b->directory = current_buffer ? current_buffer->directory : Qnil;
557 558
558 b->last_window_start = 1; 559 b->last_window_start = 1;
559 560
560 b->name = name; 561 b->name = name;
561 if (XSTRING_BYTE (name, 0) != ' ') 562 if (string_byte (name, 0) != ' ')
562 b->undo_list = Qnil; 563 b->undo_list = Qnil;
563 else 564 else
564 b->undo_list = Qt; 565 b->undo_list = Qt;
565 566
566 /* initialize the extent list */ 567 /* initialize the extent list */
568 569
569 /* Put this in the alist of all live buffers. */ 570 /* Put this in the alist of all live buffers. */
570 push_buffer_alist (name, buf); 571 push_buffer_alist (name, buf);
571 572
572 init_buffer_markers (b); 573 init_buffer_markers (b);
574 init_buffer_syntax_cache (b);
573 575
574 b->generated_modeline_string = Fmake_string (make_int (84), make_int (' ')); 576 b->generated_modeline_string = Fmake_string (make_int (84), make_int (' '));
575 b->modeline_extent_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, 577 b->modeline_extent_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK,
576 HASH_TABLE_EQ); 578 HASH_TABLE_EQ);
577 579
1003 for (tail = alist; !NILP (tail); tail = Fcdr (tail)) 1005 for (tail = alist; !NILP (tail); tail = Fcdr (tail))
1004 { 1006 {
1005 buf = Fcdr (Fcar (tail)); 1007 buf = Fcdr (Fcar (tail));
1006 if (EQ (buf, buffer)) 1008 if (EQ (buf, buffer))
1007 continue; 1009 continue;
1008 if (XSTRING_BYTE (XBUFFER (buf)->name, 0) == ' ') 1010 if (string_byte (XBUFFER (buf)->name, 0) == ' ')
1009 continue; 1011 continue;
1010 /* If FRAME has a buffer_predicate, 1012 /* If FRAME has a buffer_predicate,
1011 disregard buffers that don't fit the predicate. */ 1013 disregard buffers that don't fit the predicate. */
1012 if (FRAMEP (frame)) 1014 if (FRAMEP (frame))
1013 { 1015 {
1241 */ 1243 */
1242 GCPRO1 (buf); 1244 GCPRO1 (buf);
1243 Freplace_buffer_in_windows (buf, Qnil, Qall); 1245 Freplace_buffer_in_windows (buf, Qnil, Qall);
1244 UNGCPRO; 1246 UNGCPRO;
1245 1247
1248 #ifdef USE_C_FONT_LOCK
1246 font_lock_buffer_was_killed (b); 1249 font_lock_buffer_was_killed (b);
1250 #endif
1247 1251
1248 /* Delete any auto-save file, if we saved it in this session. */ 1252 /* Delete any auto-save file, if we saved it in this session. */
1249 if (STRINGP (b->auto_save_file_name) 1253 if (STRINGP (b->auto_save_file_name)
1250 && b->auto_save_modified != 0 1254 && b->auto_save_modified != 0
1251 && BUF_SAVE_MODIFF (b) < b->auto_save_modified) 1255 && BUF_SAVE_MODIFF (b) < b->auto_save_modified)
1272 } 1276 }
1273 } 1277 }
1274 } 1278 }
1275 1279
1276 uninit_buffer_markers (b); 1280 uninit_buffer_markers (b);
1281 uninit_buffer_syntax_cache (b);
1277 1282
1278 kill_buffer_local_variables (b); 1283 kill_buffer_local_variables (b);
1279 1284
1280 b->name = Qnil; 1285 b->name = Qnil;
1281 uninit_buffer_text (b); 1286 uninit_buffer_text (b);
1741 plist = cons3 (make_int (b->text->field), \ 1746 plist = cons3 (make_int (b->text->field), \
1742 intern_converting_underscores_to_dashes (#field), plist) 1747 intern_converting_underscores_to_dashes (#field), plist)
1743 #define ADD_BOOL(field) \ 1748 #define ADD_BOOL(field) \
1744 plist = cons3 (b->text->field ? Qt : Qnil, \ 1749 plist = cons3 (b->text->field ? Qt : Qnil, \
1745 intern_converting_underscores_to_dashes (#field), plist) 1750 intern_converting_underscores_to_dashes (#field), plist)
1746 ADD_BOOL (entirely_ascii_p);
1747 ADD_INT (bufz); 1751 ADD_INT (bufz);
1748 ADD_INT (z); 1752 ADD_INT (z);
1749 ADD_INT (mule_bufmin); 1753 ADD_INT (mule_bufmin);
1750 ADD_INT (mule_bufmax); 1754 ADD_INT (mule_bufmax);
1751 ADD_INT (mule_bytmin); 1755 ADD_INT (mule_bytmin);
1752 ADD_INT (mule_bytmax); 1756 ADD_INT (mule_bytmax);
1753 ADD_INT (mule_shifter); 1757 ADD_INT (mule_shifter);
1754 ADD_BOOL (mule_three_p); 1758 ADD_BOOL (mule_three_p);
1759 ADD_BOOL (entirely_one_byte_p);
1760 ADD_INT (num_ascii_chars);
1761 ADD_INT (num_8_bit_fixed_chars);
1762 ADD_INT (num_16_bit_fixed_chars);
1755 { 1763 {
1756 Lisp_Object pos[16]; 1764 Lisp_Object pos[16];
1757 int i; 1765 int i;
1758 for (i = 0; i < 16; i++) 1766 for (i = 0; i < 16; i++)
1759 pos[i] = make_int (b->text->mule_charbpos_cache[i]); 1767 pos[i] = make_int (b->text->mule_charbpos_cache[i]);