mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-31 09:20:54 -08:00
df5b49306e
* configure.ac (BITSIZEOF_SIZE_T, SIZEOF_SIZE_T): New symbols to configure. * src/alloc.c (ROUNDUP): Move here from lisp.h, since it's now used only in this file. Use a more-efficient implementation if the second argument is a power of 2. (ALIGN): Rewrite in terms of ROUNDUP. Make it a function. Remove no-longer-necessary compile-time checks. (bool_vector_exact_payload_bytes): New function. (bool_vector_payload_bytes): Remove 2nd arg; callers that need exact payload changed to call the new function. Do not assume that the arg or result fits in ptrdiff_t. (bool_vector_fill): New function. (Fmake_bool_vector): Use it. Don't assume bit counts fit in ptrdiff_t. (vroundup_ct): Don't assume arg fits in size_t. * src/category.c (SET_CATEGORY_SET): Remove. All callers now just invoke set_category_set. (set_category_set): 2nd arg is now EMACS_INT and 3rd is now bool. All callers changed. Use bool_vector_set. * src/category.h (XCATEGORY_SET): Remove; no longer needed. (CATEGORY_MEMBER): Now a function. Rewrite in terms of bool_vector_bitref. * src/data.c (Faref): Use bool_vector_ref. (Faset): Use bool_vector_set. (bits_word_to_host_endian): Don't assume you can shift by CHAR_BIT. (Fbool_vector_not, Fbool_vector_count_matches) (Fbool_vector_count_matches_at): Don't assume CHAR_BIT == 8. * src/fns.c (concat): Use bool_vector_ref. (Ffillarray): Use bool_vector_fill. (mapcar1): Use bool_vector_ref. (sxhash_bool_vector): Hash words, not bytes. * src/lisp.h (BOOL_VECTOR_BITS_PER_CHAR): Now a macro as well as a constant, since it's now used in #if. (bits_word, BITS_WORD_MAX, BITS_PER_BITS_WORD): Fall back on unsigned char on unusual architectures, so that we no longer assume that the number of bits per bits_word is a power of two or is a multiple of 8 or of CHAR_BIT. (Qt): Add forward decl. (struct Lisp_Bool_Vector): Don't assume EMACS_INT is aligned at least as strictly as bits_word. (bool_vector_data, bool_vector_uchar_data): New accessors. All data structure accesses changed to use them. (bool_vector_words, bool_vector_bitref, bool_vector_ref) (bool_vector_set): New functions. (bool_vector_fill): New decl. (ROUNDUP): Move to alloc.c as described above.
118 lines
4.4 KiB
C
118 lines
4.4 KiB
C
/* Declarations having to do with Emacs category tables.
|
|
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
|
National Institute of Advanced Industrial Science and Technology (AIST)
|
|
Registration Number H14PRO021
|
|
Copyright (C) 2003
|
|
National Institute of Advanced Industrial Science and Technology (AIST)
|
|
Registration Number H13PRO009
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs 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.
|
|
|
|
GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
/* We introduce here three types of object: category, category set,
|
|
and category table.
|
|
|
|
A category is like syntax but differs in the following points:
|
|
|
|
o A category is represented by a mnemonic character of the range
|
|
` '(32)..`~'(126) (printable ASCII characters).
|
|
|
|
o A category is not exclusive, i.e. a character has multiple
|
|
categories (category set). Of course, there's a case that a
|
|
category set is empty, i.e. the character has no category.
|
|
|
|
o In addition to the predefined categories, a user can define new
|
|
categories. Total number of categories is limited to 95.
|
|
|
|
A category set is a set of categories represented by Lisp
|
|
bool-vector of length 128 (only elements of 31th through 126th
|
|
are used).
|
|
|
|
A category table is like syntax-table, represented by a Lisp
|
|
char-table. The contents are category sets or nil. It has two
|
|
extra slots, for a vector of doc string of each category and a
|
|
version number.
|
|
|
|
The first extra slot is a vector of doc strings of categories, the
|
|
length is 95. The Nth element corresponding to the category N+32.
|
|
|
|
The second extra slot is a version number of the category table.
|
|
But, for the moment, we are not using this slot. */
|
|
|
|
INLINE_HEADER_BEGIN
|
|
|
|
#define CATEGORYP(x) RANGED_INTEGERP (0x20, x, 0x7E)
|
|
|
|
#define CHECK_CATEGORY(x) \
|
|
CHECK_TYPE (CATEGORYP (x), Qcategoryp, x)
|
|
|
|
#define CATEGORY_SET_P(x) \
|
|
(BOOL_VECTOR_P (x) && bool_vector_size (x) == 128)
|
|
|
|
/* Return a new empty category set. */
|
|
#define MAKE_CATEGORY_SET (Fmake_bool_vector (make_number (128), Qnil))
|
|
|
|
#define CHECK_CATEGORY_SET(x) \
|
|
CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
|
|
|
|
/* Return the category set of character C in the current category table. */
|
|
#define CATEGORY_SET(c) char_category_set (c)
|
|
|
|
/* Return true if CATEGORY_SET contains CATEGORY.
|
|
Faster than '!NILP (Faref (category_set, make_number (category)))'. */
|
|
INLINE bool
|
|
CATEGORY_MEMBER (EMACS_INT category, Lisp_Object category_set)
|
|
{
|
|
return bool_vector_bitref (category_set, category);
|
|
}
|
|
|
|
/* Return true if category set of CH contains CATEGORY. */
|
|
INLINE bool
|
|
CHAR_HAS_CATEGORY (int ch, int category)
|
|
{
|
|
Lisp_Object category_set = CATEGORY_SET (ch);
|
|
return CATEGORY_MEMBER (category, category_set);
|
|
}
|
|
|
|
/* The standard category table is stored where it will automatically
|
|
be used in all new buffers. */
|
|
#define Vstandard_category_table BVAR (&buffer_defaults, category_table)
|
|
|
|
/* Return the doc string of CATEGORY in category table TABLE. */
|
|
#define CATEGORY_DOCSTRING(table, category) \
|
|
AREF (Fchar_table_extra_slot (table, make_number (0)), ((category) - ' '))
|
|
|
|
/* Set the doc string of CATEGORY to VALUE in category table TABLE. */
|
|
#define SET_CATEGORY_DOCSTRING(table, category, value) \
|
|
ASET (Fchar_table_extra_slot (table, make_number (0)), ((category) - ' '), value)
|
|
|
|
/* Return the version number of category table TABLE. Not used for
|
|
the moment. */
|
|
#define CATEGORY_TABLE_VERSION (table) \
|
|
Fchar_table_extra_slot (table, make_number (1))
|
|
|
|
/* Return true if there is a word boundary between two
|
|
word-constituent characters C1 and C2 if they appear in this order.
|
|
There is no word boundary between two word-constituent ASCII and
|
|
Latin-1 characters. */
|
|
#define WORD_BOUNDARY_P(c1, c2) \
|
|
(!(SINGLE_BYTE_CHAR_P (c1) && SINGLE_BYTE_CHAR_P (c2)) \
|
|
&& word_boundary_p (c1, c2))
|
|
|
|
extern bool word_boundary_p (int, int);
|
|
|
|
INLINE_HEADER_END
|