Mercurial > hg > xemacs-beta
view src/casetab.h @ 5552:85210c453a97
Fix performance regression in refactored syntax cache setup.
More doc improvements.
* syntax.h (enum syntax_source):
New. Specify whether syntax is from property or buffer.
(struct syntax_cache):
Use enum syntax_source source, instead of no_syntax_table_prop
and use_code.
Improve comments.
(SOURCE_IS_TABLE):
New predicate.
(SYNTAX_CODE_FROM_CACHE):
Use it instead of use_code, and adjust logic.
* syntax.c (syntax_cache_table_was_changed):
Check cache->source (cache->no_syntax_table_prop is gone).
(reset_syntax_cache_range):
All information about OBJECT and BUFFER is in CACHE already.
Also reset markers in OBJECT if it is a buffer.
Rename INFINITE to VALID_EVERYWHERE.
(init_syntax_cache):
Initialize source (cache->no_syntax_table_prop is gone).
Maybe initialize start and end to null markers.
Initialize cache range with reset_syntax_cache_range.
(update_syntax_cache):
Use source instead of no_syntax_table_prop and use_code.
(setup_syntax_cache):
Add header comment. Improve other comments.
Make calls to reset_syntax_cache_range and init_syntax_cache match
their prototypes.
(init_buffer_syntax_cache):
Use init_syntax_cache to do the work.
(signal_syntax_cache_extent_changed):
Make call to reset_syntax_cache_range match its prototype.
Improve local variable naming.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Tue, 23 Aug 2011 04:41:45 +0900 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
/* XEmacs routines to deal with case tables. Copyright (C) 2000 Yoshiki Hayashi. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_casetab_h_ #define INCLUDED_casetab_h_ struct Lisp_Case_Table { NORMAL_LISP_OBJECT_HEADER header; Lisp_Object downcase_table; Lisp_Object upcase_table; Lisp_Object case_canon_table; Lisp_Object case_eqv_table; int dirty; }; typedef struct Lisp_Case_Table Lisp_Case_Table; DECLARE_LISP_OBJECT (case_table, Lisp_Case_Table); #define XCASE_TABLE(x) XRECORD (x, case_table, Lisp_Case_Table) #define wrap_case_table(p) wrap_record (p, case_table) #define CASE_TABLEP(x) RECORDP (x, case_table) #define CHECK_CASE_TABLE(x) CHECK_RECORD (x, case_table) #define CONCHECK_CASE_TABLE(x) CONCHECK_RECORD (x, case_table) void recompute_case_table (Lisp_Object casetab); DECLARE_INLINE_HEADER ( Lisp_Case_Table * XCASE_TABLE_UPDATE (Lisp_Object table) ) { Lisp_Case_Table *ct = XCASE_TABLE (table); /* If the table is dirty (changes have been made without ancillary structures updated), recompute first. */ if (ct->dirty) recompute_case_table (table); return ct; } #define CASE_TABLE_DOWNCASE(ct) ((ct)->downcase_table) #define CASE_TABLE_UPCASE(ct) ((ct)->upcase_table) #define CASE_TABLE_CANON(ct) ((ct)->case_canon_table) #define CASE_TABLE_EQV(ct) ((ct)->case_eqv_table) #define XCASE_TABLE_DOWNCASE(ct) (XCASE_TABLE (ct)->downcase_table) #define XCASE_TABLE_UPCASE(ct) (XCASE_TABLE (ct)->upcase_table) /* Only do automatic updating for canon and eqv, which are the two that are automatically computed and that are not up to date. These are not normally used by the simple case routines. canon is used by compare-buffer-substrings when case-insensitive and by the regex routines, and eqv is used only by the Boyer-Moore search routines. */ #define XCASE_TABLE_CANON(ct) (XCASE_TABLE_UPDATE (ct)->case_canon_table) #define XCASE_TABLE_EQV(ct) (XCASE_TABLE_UPDATE (ct)->case_eqv_table) #define SET_CASE_TABLE_DOWNCASE(ct, p) ((ct)->downcase_table = p) #define SET_CASE_TABLE_UPCASE(ct, p) ((ct)->upcase_table = p) #define SET_CASE_TABLE_CANON(ct, p) ((ct)->case_canon_table = p) #define SET_CASE_TABLE_EQV(ct, p) ((ct)->case_eqv_table = p) #define XSET_CASE_TABLE_DOWNCASE(ct, p) \ SET_CASE_TABLE_DOWNCASE (XCASE_TABLE (ct), p) #define XSET_CASE_TABLE_UPCASE(ct, p) \ SET_CASE_TABLE_UPCASE (XCASE_TABLE (ct), p) #define XSET_CASE_TABLE_CANON(ct, p) \ SET_CASE_TABLE_CANON (XCASE_TABLE (ct), p) #define XSET_CASE_TABLE_EQV(ct, p) \ SET_CASE_TABLE_EQV (XCASE_TABLE (ct), p) extern Lisp_Object Vstandard_case_table; #endif /* INCLUDED_casetab_h_ */