Mercurial > hg > xemacs-beta
comparison src/marker.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 | a5954632b187 |
children | 1e4e42de23d5 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
59 Lisp_Marker *marker = XMARKER (obj); | 59 Lisp_Marker *marker = XMARKER (obj); |
60 | 60 |
61 if (print_readably) | 61 if (print_readably) |
62 printing_unreadable_object ("#<marker 0x%lx>", (long) marker); | 62 printing_unreadable_object ("#<marker 0x%lx>", (long) marker); |
63 | 63 |
64 write_c_string (GETTEXT ("#<marker "), printcharfun); | 64 write_c_string (printcharfun, GETTEXT ("#<marker ")); |
65 if (!marker->buffer) | 65 if (!marker->buffer) |
66 write_c_string (GETTEXT ("in no buffer"), printcharfun); | 66 write_c_string (printcharfun, GETTEXT ("in no buffer")); |
67 else | 67 else |
68 { | 68 { |
69 write_fmt_string (printcharfun, "at %ld in ", (long) marker_position (obj)); | 69 write_fmt_string (printcharfun, "at %ld in ", |
70 (long) marker_position (obj)); | |
70 print_internal (marker->buffer->name, printcharfun, 0); | 71 print_internal (marker->buffer->name, printcharfun, 0); |
71 } | 72 } |
73 if (marker->insertion_type) | |
74 write_c_string (printcharfun, " insertion-type=t"); | |
72 write_fmt_string (printcharfun, " 0x%lx>", (long) marker); | 75 write_fmt_string (printcharfun, " 0x%lx>", (long) marker); |
73 } | 76 } |
74 | 77 |
75 static int | 78 static int |
76 marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) | 79 marker_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) |
314 | 317 |
315 marker->buffer = 0; | 318 marker->buffer = 0; |
316 } | 319 } |
317 | 320 |
318 Bytebpos | 321 Bytebpos |
319 bi_marker_position (Lisp_Object marker) | 322 byte_marker_position (Lisp_Object marker) |
320 { | 323 { |
321 Lisp_Marker *m = XMARKER (marker); | 324 Lisp_Marker *m = XMARKER (marker); |
322 struct buffer *buf = m->buffer; | 325 struct buffer *buf = m->buffer; |
323 Bytebpos pos; | 326 Bytebpos pos; |
324 | 327 |
332 macro has an assert() in it that will catch these denormalized | 335 macro has an assert() in it that will catch these denormalized |
333 positions. */ | 336 positions. */ |
334 pos = membpos_to_bytebpos (buf, m->membpos); | 337 pos = membpos_to_bytebpos (buf, m->membpos); |
335 | 338 |
336 #ifdef ERROR_CHECK_TEXT | 339 #ifdef ERROR_CHECK_TEXT |
337 if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) | 340 if (pos < BYTE_BUF_BEG (buf) || pos > BYTE_BUF_Z (buf)) |
338 abort (); | 341 abort (); |
339 #endif | 342 #endif |
340 | 343 |
341 return pos; | 344 return pos; |
342 } | 345 } |
347 struct buffer *buf = XMARKER (marker)->buffer; | 350 struct buffer *buf = XMARKER (marker)->buffer; |
348 | 351 |
349 if (!buf) | 352 if (!buf) |
350 invalid_argument ("Marker does not point anywhere", Qunbound); | 353 invalid_argument ("Marker does not point anywhere", Qunbound); |
351 | 354 |
352 return bytebpos_to_charbpos (buf, bi_marker_position (marker)); | 355 return bytebpos_to_charbpos (buf, byte_marker_position (marker)); |
353 } | 356 } |
354 | 357 |
355 void | 358 void |
356 set_bi_marker_position (Lisp_Object marker, Bytebpos pos) | 359 set_byte_marker_position (Lisp_Object marker, Bytebpos pos) |
357 { | 360 { |
358 Lisp_Marker *m = XMARKER (marker); | 361 Lisp_Marker *m = XMARKER (marker); |
359 struct buffer *buf = m->buffer; | 362 struct buffer *buf = m->buffer; |
360 | 363 |
361 if (!buf) | 364 if (!buf) |
362 invalid_argument ("Marker does not point anywhere", Qunbound); | 365 invalid_argument ("Marker does not point anywhere", Qunbound); |
363 | 366 |
364 #ifdef ERROR_CHECK_TEXT | 367 #ifdef ERROR_CHECK_TEXT |
365 if (pos < BI_BUF_BEG (buf) || pos > BI_BUF_Z (buf)) | 368 if (pos < BYTE_BUF_BEG (buf) || pos > BYTE_BUF_Z (buf)) |
366 abort (); | 369 abort (); |
367 #endif | 370 #endif |
368 | 371 |
369 m->membpos = bytebpos_to_membpos (buf, pos); | 372 m->membpos = bytebpos_to_membpos (buf, pos); |
370 } | 373 } |
375 struct buffer *buf = XMARKER (marker)->buffer; | 378 struct buffer *buf = XMARKER (marker)->buffer; |
376 | 379 |
377 if (!buf) | 380 if (!buf) |
378 invalid_argument ("Marker does not point anywhere", Qunbound); | 381 invalid_argument ("Marker does not point anywhere", Qunbound); |
379 | 382 |
380 set_bi_marker_position (marker, charbpos_to_bytebpos (buf, pos)); | 383 set_byte_marker_position (marker, charbpos_to_bytebpos (buf, pos)); |
381 } | 384 } |
382 | 385 |
383 static Lisp_Object | 386 static Lisp_Object |
384 copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) | 387 copy_marker_1 (Lisp_Object marker, Lisp_Object type, int noseeum) |
385 { | 388 { |
455 Someone should discuss this with Stallman, but I don't have the | 458 Someone should discuss this with Stallman, but I don't have the |
456 stomach. In fact, this function sucks so badly that I'm disabling | 459 stomach. In fact, this function sucks so badly that I'm disabling |
457 it by default (although I've debugged it). If you want to use it, | 460 it by default (although I've debugged it). If you want to use it, |
458 use extents instead. --hniksic */ | 461 use extents instead. --hniksic */ |
459 #if 0 | 462 #if 0 |
460 xxDEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, 1, 1, 0, /* | 463 DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, 1, 1, 0, /* |
461 Return t if there are markers pointing at POSITION in the current buffer. | 464 Return t if there are markers pointing at POSITION in the current buffer. |
462 */ | 465 */ |
463 (position)) | 466 (position)) |
464 { | 467 { |
465 Lisp_Marker *marker; | 468 Lisp_Marker *marker; |