comparison src/extents.h @ 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 6504113e7c2d
children 79c6ff3eef26
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
1 /* Copyright (c) 1994, 1995 Free Software Foundation. 1 /* Copyright (c) 1994, 1995 Free Software Foundation.
2 Copyright (c) 1995 Ben Wing. 2 Copyright (c) 1995, 1996 Ben Wing.
3 3
4 This file is part of XEmacs. 4 This file is part of XEmacs.
5 5
6 XEmacs is free software; you can redistribute it and/or modify it 6 XEmacs is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published by the 7 under the terms of the GNU General Public License as published by the
41 41
42 struct extent 42 struct extent
43 { 43 {
44 struct lrecord_header lheader; 44 struct lrecord_header lheader;
45 45
46 Membpos start; 46 Memxpos start;
47 Membpos end; 47 Memxpos end;
48 Lisp_Object object; /* A buffer, string, Qnil (extent detached from no 48 Lisp_Object object; /* A buffer, string, Qnil (extent detached from no
49 buffer), Qt (destroyed extent) */ 49 buffer), Qt (destroyed extent) */
50 50
51 /* Extent properties are conceptually a plist, but the most common 51 /* Extent properties are conceptually a plist, but the most common
52 props are implemented as bits instead of conses. */ 52 props are implemented as bits instead of conses. */
107 #define extent_endpoint(e, endp) ((endp) ? extent_end (e) : extent_start (e)) 107 #define extent_endpoint(e, endp) ((endp) ? extent_end (e) : extent_start (e))
108 #define set_extent_endpoint(e, val, endp) \ 108 #define set_extent_endpoint(e, val, endp) \
109 ((endp) ? set_extent_end (e, val) : set_extent_start (e, val)) 109 ((endp) ? set_extent_end (e, val) : set_extent_start (e, val))
110 #define extent_detached_p(e) (extent_start (e) < 0) 110 #define extent_detached_p(e) (extent_start (e) < 0)
111 111
112 void set_extent_endpoints (EXTENT extent, Bytexpos s, Bytexpos e,
113 Lisp_Object object);
114
112 /* Additional information that may be present in an extent. The idea is 115 /* Additional information that may be present in an extent. The idea is
113 that fast access is provided to this information, but since (hopefully) 116 that fast access is provided to this information, but since (hopefully)
114 most extents won't have this set on them, we usually don't need to 117 most extents won't have this set on them, we usually don't need to
115 have this structure around and thus the size of an extent is smaller. */ 118 have this structure around and thus the size of an extent is smaller. */
116 119
175 only be used on extents known not to have a parent. The other 178 only be used on extents known not to have a parent. The other
176 versions chase down any parent links. */ 179 versions chase down any parent links. */
177 180
178 #define extent_no_chase_normal_field(e, field) ((e)->flags.field) 181 #define extent_no_chase_normal_field(e, field) ((e)->flags.field)
179 182
180 INLINE_HEADER struct extent_auxiliary *extent_aux_or_default (EXTENT e); 183 DECLARE_INLINE_HEADER (
181 INLINE_HEADER struct extent_auxiliary * 184 struct extent_auxiliary *
182 extent_aux_or_default (EXTENT e) 185 extent_aux_or_default (EXTENT e)
186 )
183 { 187 {
184 return e->flags.has_aux ? 188 return e->flags.has_aux ?
185 XEXTENT_AUXILIARY (XCAR (e->plist)) : 189 XEXTENT_AUXILIARY (XCAR (e->plist)) :
186 & extent_auxiliary_defaults; 190 & extent_auxiliary_defaults;
187 } 191 }
215 because they need special handling and it's cleaner just to 219 because they need special handling and it's cleaner just to
216 do this in the particular functions that need to do this. */ 220 do this in the particular functions that need to do this. */
217 221
218 #define extent_parent(e) extent_no_chase_aux_field (e, parent) 222 #define extent_parent(e) extent_no_chase_aux_field (e, parent)
219 #define extent_children(e) extent_no_chase_aux_field (e, children) 223 #define extent_children(e) extent_no_chase_aux_field (e, children)
224
225 EXTENT extent_ancestor_1 (EXTENT e);
226
227 /* extent_ancestor() chases all the parent links until there aren't any
228 more. extent_ancestor_1() does the same thing but it a function;
229 the following optimizes the most common case. */
230 DECLARE_INLINE_HEADER (
231 EXTENT
232 extent_ancestor (EXTENT e)
233 )
234 {
235 return e->flags.has_parent ? extent_ancestor_1 (e) : e;
236 }
220 237
221 #define extent_begin_glyph(e) extent_aux_field (e, begin_glyph) 238 #define extent_begin_glyph(e) extent_aux_field (e, begin_glyph)
222 #define extent_end_glyph(e) extent_aux_field (e, end_glyph) 239 #define extent_end_glyph(e) extent_aux_field (e, end_glyph)
223 #define extent_priority(e) extent_aux_field (e, priority) 240 #define extent_priority(e) extent_aux_field (e, priority)
224 #define extent_invisible(e) extent_aux_field (e, invisible) 241 #define extent_invisible(e) extent_aux_field (e, invisible)
278 #define set_extent_internal_p(e, val) \ 295 #define set_extent_internal_p(e, val) \
279 set_extent_normal_field (e, internal, val) 296 set_extent_normal_field (e, internal, val)
280 #define set_extent_in_red_event_p(e, val) \ 297 #define set_extent_in_red_event_p(e, val) \
281 set_extent_normal_field (e, in_red_event, val) 298 set_extent_normal_field (e, in_red_event, val)
282 299
283 INLINE_HEADER Lisp_Object * extent_no_chase_plist_addr (EXTENT e); 300 void set_extent_glyph (EXTENT extent, Lisp_Object glyph, int endp,
284 INLINE_HEADER Lisp_Object * 301 glyph_layout layout);
302
303 DECLARE_INLINE_HEADER (
304 Lisp_Object *
285 extent_no_chase_plist_addr (EXTENT e) 305 extent_no_chase_plist_addr (EXTENT e)
306 )
286 { 307 {
287 return e->flags.has_aux ? &XCDR (e->plist) : &e->plist; 308 return e->flags.has_aux ? &XCDR (e->plist) : &e->plist;
288 } 309 }
289 310
290 #define extent_no_chase_plist(e) (*extent_no_chase_plist_addr (e)) 311 #define extent_no_chase_plist(e) (*extent_no_chase_plist_addr (e))
327 CONCHECK_EXTENT (x); \ 348 CONCHECK_EXTENT (x); \
328 if (!EXTENT_LIVE_P (XEXTENT (x))) \ 349 if (!EXTENT_LIVE_P (XEXTENT (x))) \
329 x = wrong_type_argument (Qextent_live_p, (x)); \ 350 x = wrong_type_argument (Qextent_live_p, (x)); \
330 } while (0) 351 } while (0)
331 352
332 EXFUN (Fdetach_extent, 1);
333 EXFUN (Fextent_end_position, 1);
334 EXFUN (Fextent_object, 1);
335 EXFUN (Fextent_start_position, 1);
336 EXFUN (Fmake_extent, 3);
337 EXFUN (Fprevious_single_property_change, 4);
338 EXFUN (Fset_extent_endpoints, 4);
339 EXFUN (Fnext_extent_change, 2);
340 EXFUN (Fprevious_extent_change, 2);
341 EXFUN (Fset_extent_parent, 2);
342 EXFUN (Fget_char_property, 4);
343 353
344 extern int inside_undo; 354 extern int inside_undo;
345 extern int in_modeline_generation; 355 extern int in_modeline_generation;
346 356
347 struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string, 357 struct extent_fragment *extent_fragment_new (Lisp_Object buffer_or_string,
348 struct frame *frm); 358 struct frame *frm);
349 face_index extent_fragment_update (struct window *w, 359 face_index extent_fragment_update (struct window *w,
350 struct extent_fragment *ef, 360 struct extent_fragment *ef,
351 /* Note this is in Bytebpos' */ 361 Bytexpos pos, Lisp_Object last_glyph);
352 Bytebpos pos, Lisp_Object last_glyph);
353 void extent_fragment_delete (struct extent_fragment *ef); 362 void extent_fragment_delete (struct extent_fragment *ef);
354
355
356 #ifdef emacs /* things other than emacs want the structs */
357 363
358 /* from alloc.c */ 364 /* from alloc.c */
359 struct extent *allocate_extent (void); 365 struct extent *allocate_extent (void);
360
361 /* from extents.c */
362 EXTENT extent_ancestor_1 (EXTENT e);
363
364 /* extent_ancestor() chases all the parent links until there aren't any
365 more. extent_ancestor_1() does the same thing but it a function;
366 the following optimizes the most common case. */
367 INLINE_HEADER EXTENT extent_ancestor (EXTENT e);
368 INLINE_HEADER EXTENT
369 extent_ancestor (EXTENT e)
370 {
371 return e->flags.has_parent ? extent_ancestor_1 (e) : e;
372 }
373 366
374 void allocate_extent_auxiliary (EXTENT ext); 367 void allocate_extent_auxiliary (EXTENT ext);
375 void init_buffer_extents (struct buffer *b); 368 void init_buffer_extents (struct buffer *b);
376 void uninit_buffer_extents (struct buffer *b); 369 void uninit_buffer_extents (struct buffer *b);
377 typedef int (*map_extents_fun) (EXTENT extent, void *arg);
378 void map_extents (Charbpos from, Charbpos to, map_extents_fun fn,
379 void *arg, Lisp_Object obj, EXTENT after,
380 unsigned int flags);
381
382 /* Note the following five functions are NOT in Charbpos's */
383 void adjust_extents (Lisp_Object object, Membpos from,
384 Membpos to, int amount);
385 void adjust_extents_for_deletion (Lisp_Object object, Bytebpos from,
386 Bytebpos to, int gapsize,
387 int numdel, int movegapsize);
388 void verify_extent_modification (Lisp_Object object, Bytebpos from,
389 Bytebpos to,
390 Lisp_Object inhibit_read_only_value);
391 void process_extents_for_insertion (Lisp_Object object,
392 Bytebpos opoint, Bytecount length);
393 void process_extents_for_deletion (Lisp_Object object, Bytebpos from,
394 Bytebpos to, int destroy_them);
395 void report_extent_modification (Lisp_Object, Charbpos, Charbpos, int);
396
397 void set_extent_glyph (EXTENT extent, Lisp_Object glyph, int endp,
398 glyph_layout layout);
399
400 void add_string_extents (Lisp_Object string, struct buffer *buf,
401 Bytebpos opoint, Bytecount length);
402 void splice_in_string_extents (Lisp_Object string, struct buffer *buf,
403 Bytebpos opoint, Bytecount length,
404 Bytecount pos);
405 void copy_string_extents (Lisp_Object new_string,
406 Lisp_Object old_string,
407 Bytecount new_pos, Bytecount old_pos,
408 Bytecount length);
409
410 void detach_all_extents (Lisp_Object object);
411 void set_extent_endpoints (EXTENT extent, Bytebpos s, Bytebpos e,
412 Lisp_Object object);
413 370
414 #ifdef ERROR_CHECK_EXTENTS 371 #ifdef ERROR_CHECK_EXTENTS
415 void sledgehammer_extent_check (Lisp_Object obj); 372 void sledgehammer_extent_check (Lisp_Object obj);
416 #endif 373 #endif
417 374
418 #ifdef MEMORY_USAGE_STATS 375 #ifdef MEMORY_USAGE_STATS
419 int compute_buffer_extent_usage (struct buffer *b, 376 int compute_buffer_extent_usage (struct buffer *b,
420 struct overhead_stats *ovstats); 377 struct overhead_stats *ovstats);
421 #endif 378 #endif
422 379
423 #endif /* emacs */
424
425 #endif /* INCLUDED_extents_h_ */ 380 #endif /* INCLUDED_extents_h_ */