Mercurial > hg > xemacs-beta
comparison src/syntax.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 | e38acbeb1cae |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
72 enum syntaxcode charset_syntax (struct buffer *buf, Lisp_Object charset, | 72 enum syntaxcode charset_syntax (struct buffer *buf, Lisp_Object charset, |
73 int *multi_p_out); | 73 int *multi_p_out); |
74 | 74 |
75 /* Return the syntax code for a particular character and mirror table. */ | 75 /* Return the syntax code for a particular character and mirror table. */ |
76 | 76 |
77 #define SYNTAX_CODE_UNSAFE(table, c) \ | 77 #define SYNTAX_CODE(table, c) XINT (get_char_table (c, table)) |
78 XINT (CHAR_TABLE_VALUE_UNSAFE (table, c)) | |
79 | |
80 INLINE_HEADER int SYNTAX_CODE (Lisp_Char_Table *table, Emchar c); | |
81 INLINE_HEADER int | |
82 SYNTAX_CODE (Lisp_Char_Table *table, Emchar c) | |
83 { | |
84 return SYNTAX_CODE_UNSAFE (table, c); | |
85 } | |
86 | |
87 #define SYNTAX_UNSAFE(table, c) \ | |
88 ((enum syntaxcode) (SYNTAX_CODE_UNSAFE (table, c) & 0177)) | |
89 | 78 |
90 #define SYNTAX_FROM_CODE(code) ((enum syntaxcode) ((code) & 0177)) | 79 #define SYNTAX_FROM_CODE(code) ((enum syntaxcode) ((code) & 0177)) |
80 | |
91 #define SYNTAX(table, c) SYNTAX_FROM_CODE (SYNTAX_CODE (table, c)) | 81 #define SYNTAX(table, c) SYNTAX_FROM_CODE (SYNTAX_CODE (table, c)) |
92 | 82 |
93 INLINE_HEADER int WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c); | 83 DECLARE_INLINE_HEADER ( |
94 INLINE_HEADER int | 84 int |
95 WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c) | 85 WORD_SYNTAX_P (Lisp_Object table, Emchar c) |
86 ) | |
96 { | 87 { |
97 return SYNTAX (table, c) == Sword; | 88 return SYNTAX (table, c) == Sword; |
98 } | 89 } |
99 | 90 |
100 /* OK, here's a graphic diagram of the format of the syntax values: | 91 /* OK, here's a graphic diagram of the format of the syntax values: |
134 */ | 125 */ |
135 | 126 |
136 | 127 |
137 /* The prefix flag bit for backward-prefix-chars is now put into bit 7. */ | 128 /* The prefix flag bit for backward-prefix-chars is now put into bit 7. */ |
138 | 129 |
139 #define SYNTAX_PREFIX_UNSAFE(table, c) \ | |
140 ((SYNTAX_CODE_UNSAFE (table, c) >> 7) & 1) | |
141 #define SYNTAX_PREFIX(table, c) \ | 130 #define SYNTAX_PREFIX(table, c) \ |
142 ((SYNTAX_CODE (table, c) >> 7) & 1) | 131 ((SYNTAX_CODE (table, c) >> 7) & 1) |
143 | 132 |
144 /* Bits 23-16 are used to implement up to two comment styles | 133 /* Bits 23-16 are used to implement up to two comment styles |
145 in a single buffer. They have the following meanings: | 134 in a single buffer. They have the following meanings: |
173 #define SYNTAX_FIRST_CHAR 0xcc | 162 #define SYNTAX_FIRST_CHAR 0xcc |
174 #define SYNTAX_SECOND_CHAR_START 0x30 | 163 #define SYNTAX_SECOND_CHAR_START 0x30 |
175 #define SYNTAX_SECOND_CHAR_END 0x03 | 164 #define SYNTAX_SECOND_CHAR_END 0x03 |
176 #define SYNTAX_SECOND_CHAR 0x33 | 165 #define SYNTAX_SECOND_CHAR 0x33 |
177 | 166 |
167 #if 0 | |
168 | |
169 /* #### Entirely unused. Should they be deleted? */ | |
178 | 170 |
179 /* #### These are now more or less equivalent to | 171 /* #### These are now more or less equivalent to |
180 SYNTAX_COMMENT_MATCH_START ...*/ | 172 SYNTAX_COMMENT_MATCH_START ...*/ |
181 /* a and b must be first and second start chars for a common type */ | 173 /* a and b must be first and second start chars for a common type */ |
182 #define SYNTAX_START_P(table, a, b) \ | 174 #define SYNTAX_START_P(table, a, b) \ |
230 ? SYNTAX_COMMENT_STYLE_A \ | 222 ? SYNTAX_COMMENT_STYLE_A \ |
231 : (STYLE_FOUND_1CHAR_P (table, a, SYNTAX_COMMENT_STYLE_B) \ | 223 : (STYLE_FOUND_1CHAR_P (table, a, SYNTAX_COMMENT_STYLE_B) \ |
232 ? SYNTAX_COMMENT_STYLE_B \ | 224 ? SYNTAX_COMMENT_STYLE_B \ |
233 : 0))) | 225 : 0))) |
234 | 226 |
235 EXFUN (Fchar_syntax, 2); | 227 #endif /* 0 */ |
236 EXFUN (Fforward_word, 2); | |
237 | |
238 /* The standard syntax table is stored where it will automatically | |
239 be used in all new buffers. */ | |
240 extern Lisp_Object Vstandard_syntax_table; | |
241 | 228 |
242 /* This array, indexed by a character, contains the syntax code which | 229 /* This array, indexed by a character, contains the syntax code which |
243 that character signifies (as a char). | 230 that character signifies (as a char). |
244 For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */ | 231 For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */ |
245 | 232 |
256 /* NOTE: This does not refer to the mirror table, but to the | 243 /* NOTE: This does not refer to the mirror table, but to the |
257 syntax table itself. */ | 244 syntax table itself. */ |
258 Lisp_Object syntax_match (Lisp_Object table, Emchar ch); | 245 Lisp_Object syntax_match (Lisp_Object table, Emchar ch); |
259 | 246 |
260 extern int no_quit_in_re_search; | 247 extern int no_quit_in_re_search; |
261 extern struct buffer *regex_emacs_buffer; | 248 |
262 | 249 void update_syntax_table (Lisp_Object table); |
263 /* This is the string or buffer in which we are matching. It is used | 250 |
264 for looking up syntax properties. */ | 251 |
265 extern Lisp_Object regex_match_object; | 252 /****************************** syntax caches ********************************/ |
266 | |
267 void update_syntax_table (Lisp_Char_Table *ct); | |
268 | |
269 #ifdef emacs | |
270 | 253 |
271 extern int lookup_syntax_properties; | 254 extern int lookup_syntax_properties; |
272 | 255 |
256 /* Now that the `syntax-table' property exists, and can override the syntax | |
257 table or directly specify the syntax, we cache the last place we | |
258 retrieved the syntax-table property. This is because, when moving | |
259 linearly through text (e.g. in the regex routines or the scanning | |
260 routines in syntax.c), we only need to recalculate at the next place the | |
261 syntax-table property changes (i.e. not every position), and when we do | |
262 need to recalculate, we can update the info from the previous info | |
263 faster than if we did the whole calculation from scratch. */ | |
273 struct syntax_cache | 264 struct syntax_cache |
274 { | 265 { |
275 int use_code; /* Whether to use syntax_code | 266 int use_code; /* Whether to use syntax_code or |
276 or current_syntax_table. */ | 267 current_syntax_table. This is |
277 struct buffer* buffer; /* The buffer the current syntax cache | 268 set depending on whether the |
278 applies to. */ | 269 syntax-table property is a |
270 syntax table or a syntax | |
271 code. */ | |
272 int no_syntax_table_prop; /* If non-zero, there was no | |
273 `syntax-table' property on the | |
274 current range, and so we're | |
275 using the buffer's syntax table. | |
276 This is important to note because | |
277 sometimes the buffer's syntax | |
278 table can be changed. */ | |
279 Lisp_Object object; /* The buffer or string the current | 279 Lisp_Object object; /* The buffer or string the current |
280 syntax cache applies to. */ | 280 syntax cache applies to, or |
281 Qnil for a string of text not | |
282 coming from a buffer or string. */ | |
283 struct buffer *buffer; /* The buffer that supplies the | |
284 syntax tables, or 0 for the | |
285 standard syntax table. If | |
286 OBJECT is a buffer, this will | |
287 always be the same buffer. */ | |
281 int syntax_code; /* Syntax code of current char. */ | 288 int syntax_code; /* Syntax code of current char. */ |
282 Lisp_Object current_syntax_table; /* Syntax table for current pos. */ | 289 Lisp_Object current_syntax_table; /* Syntax table for current pos. */ |
283 Lisp_Object old_prop; /* Syntax-table prop at prev pos. */ | 290 Lisp_Object start, end; /* Markers to keep track of the |
284 | 291 known region in a buffer. |
285 Charbpos next_change; /* Position of the next extent | 292 Formerly we used an internal |
293 extent, but it seems that having | |
294 an extent over the entire buffer | |
295 causes serious slowdowns in | |
296 extent operations! Yuck! */ | |
297 Charxpos next_change; /* Position of the next extent | |
286 change. */ | 298 change. */ |
287 Charbpos prev_change; /* Position of the previous | 299 Charxpos prev_change; /* Position of the previous extent |
288 extent change. */ | 300 change. */ |
289 }; | 301 }; |
290 extern struct syntax_cache syntax_cache; | 302 |
291 | 303 /* Note that the external interface to the syntax-cache uses charpos's, but |
292 void update_syntax_cache (int pos, int count, int init); | 304 intnernally we use bytepos's, for speed. */ |
305 | |
306 void update_syntax_cache (struct syntax_cache *cache, Charxpos pos, int count); | |
307 struct syntax_cache *setup_syntax_cache (struct syntax_cache *cache, | |
308 Lisp_Object object, | |
309 struct buffer *buffer, | |
310 Charxpos from, int count); | |
311 struct syntax_cache *setup_buffer_syntax_cache (struct buffer *buffer, | |
312 Charxpos from, int count); | |
293 | 313 |
294 /* Make syntax cache state good for CHARPOS, assuming it is | 314 /* Make syntax cache state good for CHARPOS, assuming it is |
295 currently good for a position before CHARPOS. */ | 315 currently good for a position before CHARPOS. */ |
296 #define UPDATE_SYNTAX_CACHE_FORWARD(pos) \ | 316 DECLARE_INLINE_HEADER ( |
297 (lookup_syntax_properties \ | 317 void |
298 ? (update_syntax_cache ((pos), 1, 0), 1) \ | 318 UPDATE_SYNTAX_CACHE_FORWARD (struct syntax_cache *cache, Charxpos pos) |
299 : 0) | 319 ) |
320 { | |
321 if (!(pos >= cache->prev_change && pos < cache->next_change)) | |
322 update_syntax_cache (cache, pos, 1); | |
323 } | |
300 | 324 |
301 /* Make syntax cache state good for CHARPOS, assuming it is | 325 /* Make syntax cache state good for CHARPOS, assuming it is |
302 currently good for a position after CHARPOS. */ | 326 currently good for a position after CHARPOS. */ |
303 #define UPDATE_SYNTAX_CACHE_BACKWARD(pos) \ | 327 DECLARE_INLINE_HEADER ( |
304 (lookup_syntax_properties \ | 328 void |
305 ? (update_syntax_cache ((pos), -1, 0), 1) \ | 329 UPDATE_SYNTAX_CACHE_BACKWARD (struct syntax_cache *cache, Charxpos pos) |
306 : 0) | 330 ) |
331 { | |
332 if (!(pos >= cache->prev_change && pos < cache->next_change)) | |
333 update_syntax_cache (cache, pos, -1); | |
334 } | |
307 | 335 |
308 /* Make syntax cache state good for CHARPOS */ | 336 /* Make syntax cache state good for CHARPOS */ |
309 #define UPDATE_SYNTAX_CACHE(pos) \ | 337 DECLARE_INLINE_HEADER ( |
310 (lookup_syntax_properties \ | 338 void |
311 ? (update_syntax_cache ((pos), 0, 0), 1) \ | 339 UPDATE_SYNTAX_CACHE (struct syntax_cache *cache, Charxpos pos) |
312 : 0) | 340 ) |
313 | 341 { |
314 #define SYNTAX_FROM_CACHE(table, c) \ | 342 if (!(pos >= cache->prev_change && pos < cache->next_change)) |
315 SYNTAX_FROM_CODE (SYNTAX_CODE_FROM_CACHE (table, c)) | 343 update_syntax_cache (cache, pos, 0); |
316 | 344 } |
317 #define SYNTAX_CODE_FROM_CACHE(table, c) \ | 345 |
318 ( syntax_cache.use_code \ | 346 #define SYNTAX_FROM_CACHE(cache, c) \ |
319 ? syntax_cache.syntax_code \ | 347 SYNTAX_FROM_CODE (SYNTAX_CODE_FROM_CACHE (cache, c)) |
320 : SYNTAX_CODE (XCHAR_TABLE (syntax_cache.current_syntax_table), \ | 348 |
321 c) \ | 349 #define SYNTAX_CODE_FROM_CACHE(cache, c) \ |
322 ) | 350 ((cache)->use_code ? (cache)->syntax_code \ |
323 | 351 : SYNTAX_CODE ((cache)->current_syntax_table, c)) |
324 /* Convert the byte offset BYTEPOS into a character position, | 352 |
325 for the object recorded in syntax_cache with SETUP_SYNTAX_TABLE_FOR_OBJECT. | 353 |
326 | 354 /***************************** syntax code macros ****************************/ |
327 The value is meant for use in the UPDATE_SYNTAX_TABLE... macros. | |
328 These macros do nothing when parse_sexp_lookup_properties is 0, | |
329 so we return 0 in that case, for speed. */ | |
330 #define SYNTAX_CACHE_BYTE_TO_CHAR(bytepos) \ | |
331 (! lookup_syntax_properties \ | |
332 ? 0 \ | |
333 : STRINGP (syntax_cache.object) \ | |
334 ? string_index_byte_to_char (syntax_cache.object, bytepos) \ | |
335 : (BUFFERP (syntax_cache.object) || NILP (syntax_cache.object)) \ | |
336 ? bytebpos_to_charbpos (syntax_cache.buffer, \ | |
337 bytepos + BI_BUF_BEGV (syntax_cache.buffer)) \ | |
338 : (bytepos)) | |
339 | |
340 #define SYNTAX_CACHE_OBJECT_BYTE_TO_CHAR(obj, buf, bytepos) \ | |
341 (! lookup_syntax_properties \ | |
342 ? 0 \ | |
343 : STRINGP (obj) \ | |
344 ? string_index_byte_to_char (obj, bytepos) \ | |
345 : (BUFFERP (obj) || NILP (obj)) \ | |
346 ? bytebpos_to_charbpos (buf, bytepos + BI_BUF_BEGV (buf)) \ | |
347 : (bytepos)) | |
348 | |
349 #else /* not emacs */ | |
350 | |
351 #define update_syntax_cache(pos, count, init) | |
352 #define UPDATE_SYNTAX_CACHE_FORWARD(pos) | |
353 #define UPDATE_SYNTAX_CACHE_BACKWARD(pos) | |
354 #define UPDATE_SYNTAX_CACHE(pos) | |
355 #define SYNTAX_FROM_CACHE SYNTAX | |
356 #define SYNTAX_CODE_FROM_CACHE SYNTAX_CODE | |
357 | |
358 #endif /* emacs */ | |
359 | |
360 #define SETUP_SYNTAX_CACHE(FROM, COUNT) \ | |
361 do { \ | |
362 syntax_cache.buffer = current_buffer; \ | |
363 syntax_cache.object = Qnil; \ | |
364 syntax_cache.current_syntax_table \ | |
365 = current_buffer->mirror_syntax_table; \ | |
366 syntax_cache.use_code = 0; \ | |
367 if (lookup_syntax_properties) \ | |
368 update_syntax_cache ((COUNT) > 0 ? (FROM) : (FROM) - 1, \ | |
369 (COUNT), 1); \ | |
370 } while (0) | |
371 | |
372 #define SETUP_SYNTAX_CACHE_FOR_BUFFER(BUFFER, FROM, COUNT) \ | |
373 do { \ | |
374 syntax_cache.buffer = (BUFFER); \ | |
375 syntax_cache.object = Qnil; \ | |
376 syntax_cache.current_syntax_table = \ | |
377 syntax_cache.buffer->mirror_syntax_table; \ | |
378 syntax_cache.use_code = 0; \ | |
379 if (lookup_syntax_properties) \ | |
380 update_syntax_cache ((FROM) + ((COUNT) > 0 ? 0 : -1), \ | |
381 (COUNT), 1); \ | |
382 } while (0) | |
383 | |
384 #define SETUP_SYNTAX_CACHE_FOR_OBJECT(OBJECT, BUFFER, FROM, COUNT) \ | |
385 do { \ | |
386 syntax_cache.buffer = (BUFFER); \ | |
387 syntax_cache.object = (OBJECT); \ | |
388 if (NILP (syntax_cache.object)) \ | |
389 { \ | |
390 /* do nothing */; \ | |
391 } \ | |
392 else if (EQ (syntax_cache.object, Qt)) \ | |
393 { \ | |
394 /* do nothing */; \ | |
395 } \ | |
396 else if (STRINGP (syntax_cache.object)) \ | |
397 { \ | |
398 /* do nothing */; \ | |
399 } \ | |
400 else if (BUFFERP (syntax_cache.object)) \ | |
401 { \ | |
402 syntax_cache.buffer = XBUFFER (syntax_cache.object); \ | |
403 } \ | |
404 else \ | |
405 { \ | |
406 /* OBJECT must be buffer/string/t/nil */ \ | |
407 assert(0); \ | |
408 } \ | |
409 syntax_cache.current_syntax_table \ | |
410 = syntax_cache.buffer->mirror_syntax_table; \ | |
411 syntax_cache.use_code = 0; \ | |
412 if (lookup_syntax_properties) \ | |
413 update_syntax_cache ((FROM) + ((COUNT) > 0 ? 0 : -1), \ | |
414 (COUNT), 1); \ | |
415 } while (0) | |
416 | 355 |
417 #define SYNTAX_CODE_PREFIX(c) \ | 356 #define SYNTAX_CODE_PREFIX(c) \ |
418 ((c >> 7) & 1) | 357 ((c >> 7) & 1) |
419 | 358 |
420 #define SYNTAX_CODE_COMMENT_BITS(c) \ | 359 #define SYNTAX_CODE_COMMENT_BITS(c) \ |