comparison src/font-lock.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 fdefd0186b75
children bf645ed7cfe3
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
1 /* Routines to compute the current syntactic context, for font-lock mode. 1 /* Routines to compute the current syntactic context, for font-lock mode.
2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 2002 Ben Wing.
4 5
5 This file is part of XEmacs. 6 This file is part of XEmacs.
6 7
7 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
40 41
41 #### We should really rewrite this to keep extents over the buffer 42 #### We should really rewrite this to keep extents over the buffer
42 that hold the current syntactic information. This would be a big win. 43 that hold the current syntactic information. This would be a big win.
43 This way there would be no guessing or incorrect results. 44 This way there would be no guessing or incorrect results.
44 */ 45 */
46
47 #if 0 /* no longer used */
45 48
46 #include <config.h> 49 #include <config.h>
47 #include "lisp.h" 50 #include "lisp.h"
48 51
49 #include "buffer.h" 52 #include "buffer.h"
422 425
423 static void 426 static void
424 find_context (struct buffer *buf, Charbpos pt) 427 find_context (struct buffer *buf, Charbpos pt)
425 { 428 {
426 /* This function can GC */ 429 /* This function can GC */
427 #ifndef emacs
428 Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
429 Lisp_Object syntaxtab = buf->syntax_table;
430 #endif
431 Emchar prev_c, c; 430 Emchar prev_c, c;
432 int prev_syncode, syncode; 431 int prev_syncode, syncode;
433 Charbpos target = pt; 432 Charbpos target = pt;
433 struct syntax_cache *scache;
434
434 setup_context_cache (buf, pt); 435 setup_context_cache (buf, pt);
435 pt = context_cache.cur_point; 436 pt = context_cache.cur_point;
436 437
437 SETUP_SYNTAX_CACHE (pt - 1, 1); 438 scache = setup_buffer_syntax_cache (buf, pt - 1, 1);
438 if (pt > BUF_BEGV (buf)) 439 if (pt > BUF_BEGV (buf))
439 { 440 {
440 c = BUF_FETCH_CHAR (buf, pt - 1); 441 c = BUF_FETCH_CHAR (buf, pt - 1);
441 syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c); 442 syncode = SYNTAX_CODE_FROM_CACHE (scache, c);
442 } 443 }
443 else 444 else
444 { 445 {
445 c = '\n'; /* to get bol_context_cache at point-min */ 446 c = '\n'; /* to get bol_context_cache at point-min */
446 syncode = Swhitespace; 447 syncode = Swhitespace;
477 context_cache.end_point = pt; 478 context_cache.end_point = pt;
478 bol_context_cache = context_cache; 479 bol_context_cache = context_cache;
479 } 480 }
480 } 481 }
481 482
482 UPDATE_SYNTAX_CACHE_FORWARD (pt); 483 UPDATE_SYNTAX_CACHE_FORWARD (scache, pt);
483 prev_c = c; 484 prev_c = c;
484 prev_syncode = syncode; 485 prev_syncode = syncode;
485 c = BUF_FETCH_CHAR (buf, pt); 486 c = BUF_FETCH_CHAR (buf, pt);
486 syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c); 487 syncode = SYNTAX_CODE_FROM_CACHE (scache, c);
487 488
488 if (prev_c == '\n') 489 if (prev_c == '\n')
489 bol_context_cache = context_cache; 490 bol_context_cache = context_cache;
490 491
491 if (context_cache.backslash_p) 492 if (context_cache.backslash_p)
492 { 493 {
493 context_cache.backslash_p = 0; 494 context_cache.backslash_p = 0;
494 continue; 495 continue;
495 } 496 }
496 497
497 switch (SYNTAX_FROM_CACHE (mirrortab, c)) 498 switch (SYNTAX_FROM_CODE (syncode))
498 { 499 {
499 case Sescape: 500 case Sescape:
500 context_cache.backslash_p = 1; 501 context_cache.backslash_p = 1;
501 break; 502 break;
502 503
547 context_cache.scontext = '\000'; 548 context_cache.scontext = '\000';
548 } 549 }
549 else if (context_cache.context == context_none) 550 else if (context_cache.context == context_none)
550 { 551 {
551 Lisp_Object stringtermobj = 552 Lisp_Object stringtermobj =
552 syntax_match (syntax_cache.current_syntax_table, c); 553 syntax_match (scache->current_syntax_table, c);
553 Emchar stringterm; 554 Emchar stringterm;
554 555
555 if (CHARP (stringtermobj)) 556 if (CHARP (stringtermobj))
556 stringterm = XCHAR (stringtermobj); 557 stringterm = XCHAR (stringtermobj);
557 else 558 else
839 void 840 void
840 vars_of_font_lock (void) 841 vars_of_font_lock (void)
841 { 842 {
842 reinit_vars_of_font_lock (); 843 reinit_vars_of_font_lock ();
843 } 844 }
845 #endif /* 0 */