projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(find_charsets_in_charc_string): New prototype; delete
[chise/xemacs-chise.git-]
/
src
/
mule-charset.h
diff --git
a/src/mule-charset.h
b/src/mule-charset.h
index
1d73c97
..
30bc569
100644
(file)
--- a/
src/mule-charset.h
+++ b/
src/mule-charset.h
@@
-324,6
+324,8
@@
Boston, MA 02111-1307, USA. */
/* Definition of leading bytes */
/************************************************************************/
/* Definition of leading bytes */
/************************************************************************/
+typedef unsigned char Charset_ID;
+
#define MIN_LEADING_BYTE 0x80
/* These need special treatment in a string and/or character */
#define LEADING_BYTE_ASCII 0x8E /* Omitted in a buffer */
#define MIN_LEADING_BYTE 0x80
/* These need special treatment in a string and/or character */
#define LEADING_BYTE_ASCII 0x8E /* Omitted in a buffer */
@@
-401,8
+403,8
@@
enum LEADING_BYTE_OFFICIAL_2
/* Is this a prefix for a private leading byte? */
/* Is this a prefix for a private leading byte? */
-INLINE int LEADING_BYTE_PREFIX_P (unsigned char lb);
-INLINE int
+INLINE_HEADER int LEADING_BYTE_PREFIX_P (unsigned char lb);
+INLINE_HEADER int
LEADING_BYTE_PREFIX_P (unsigned char lb)
{
return (lb == PRE_LEADING_BYTE_PRIVATE_1 ||
LEADING_BYTE_PREFIX_P (unsigned char lb)
{
return (lb == PRE_LEADING_BYTE_PRIVATE_1 ||
@@
-552,11
+554,14
@@
DECLARE_LRECORD (charset, Lisp_Charset);
CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs))
struct charset_lookup {
CHARSET_REVERSE_DIRECTION_CHARSET (XCHARSET (cs))
struct charset_lookup {
- /* Table of charsets indexed by leading byte. */
- Lisp_Object charset_by_leading_byte[128];
+ /* Table of charsets indexed by (leading byte - MIN_LEADING_BYTE). */
+ Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES];
/* Table of charsets indexed by type/final-byte/direction. */
Lisp_Object charset_by_attributes[4][128][2];
/* Table of charsets indexed by type/final-byte/direction. */
Lisp_Object charset_by_attributes[4][128][2];
+
+ Charset_ID next_allocated_1_byte_leading_byte;
+ Charset_ID next_allocated_2_byte_leading_byte;
};
extern struct charset_lookup *chlook;
};
extern struct charset_lookup *chlook;
@@
-565,17
+570,19
@@
extern struct charset_lookup *chlook;
/* int not Bufbyte even though that is the actual type of a leading byte.
This way, out-ot-range values will get caught rather than automatically
truncated. */
/* int not Bufbyte even though that is the actual type of a leading byte.
This way, out-ot-range values will get caught rather than automatically
truncated. */
-INLINE Lisp_Object CHARSET_BY_LEADING_BYTE (int lb);
-INLINE Lisp_Object
+INLINE_HEADER Lisp_Object CHARSET_BY_LEADING_BYTE (int lb);
+INLINE_HEADER Lisp_Object
CHARSET_BY_LEADING_BYTE (int lb)
{
CHARSET_BY_LEADING_BYTE (int lb)
{
- assert (lb >= 0x80 && lb <= 0xFF);
- return chlook->charset_by_leading_byte[lb - 128];
+ assert (lb >= MIN_LEADING_BYTE &&
+ lb < (MIN_LEADING_BYTE + NUM_LEADING_BYTES));
+ return chlook->charset_by_leading_byte[lb - MIN_LEADING_BYTE];
}
#else
}
#else
-#define CHARSET_BY_LEADING_BYTE(lb) (chlook->charset_by_leading_byte[(lb) - 128])
+#define CHARSET_BY_LEADING_BYTE(lb) \
+ (chlook->charset_by_leading_byte[(lb) - MIN_LEADING_BYTE])
#endif
#endif
@@
-592,8
+599,8
@@
CHARSET_BY_LEADING_BYTE (int lb)
extern const Bytecount rep_bytes_by_first_byte[0xA0];
/* Number of bytes in the string representation of a character. */
extern const Bytecount rep_bytes_by_first_byte[0xA0];
/* Number of bytes in the string representation of a character. */
-INLINE int REP_BYTES_BY_FIRST_BYTE (int fb);
-INLINE int
+INLINE_HEADER int REP_BYTES_BY_FIRST_BYTE (int fb);
+INLINE_HEADER int
REP_BYTES_BY_FIRST_BYTE (int fb)
{
#ifdef ERROR_CHECK_TYPECHECK
REP_BYTES_BY_FIRST_BYTE (int fb)
{
#ifdef ERROR_CHECK_TYPECHECK
@@
-607,11
+614,7
@@
REP_BYTES_BY_FIRST_BYTE (int fb)
/* Dealing with characters */
/************************************************************************/
/* Dealing with characters */
/************************************************************************/
-/* Is this character represented by more than one byte in a string? */
-
-#define CHAR_MULTIBYTE_P(c) ((c) >= 0x80)
-
-#define CHAR_ASCII_P(c) (!CHAR_MULTIBYTE_P (c))
+#define CHAR_ASCII_P(ch) ((ch) <= 0x7F)
/* The bit fields of character are divided into 3 parts:
FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */
/* The bit fields of character are divided into 3 parts:
FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */
@@
-675,8
+678,8
@@
REP_BYTES_BY_FIRST_BYTE (int fb)
FIELD2_TO_PRIVATE_LEADING_BYTE are the same.
*/
FIELD2_TO_PRIVATE_LEADING_BYTE are the same.
*/
-INLINE Bufbyte CHAR_LEADING_BYTE (Emchar c);
-INLINE Bufbyte
+INLINE_HEADER Bufbyte CHAR_LEADING_BYTE (Emchar c);
+INLINE_HEADER Bufbyte
CHAR_LEADING_BYTE (Emchar c)
{
if (CHAR_ASCII_P (c))
CHAR_LEADING_BYTE (Emchar c)
{
if (CHAR_ASCII_P (c))
@@
-710,8
+713,8
@@
CHAR_LEADING_BYTE (Emchar c)
FIELD2_TO_PRIVATE_LEADING_BYTE are the same.
*/
FIELD2_TO_PRIVATE_LEADING_BYTE are the same.
*/
-INLINE Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2);
-INLINE Emchar
+INLINE_HEADER Emchar MAKE_CHAR (Lisp_Object charset, int c1, int c2);
+INLINE_HEADER Emchar
MAKE_CHAR (Lisp_Object charset, int c1, int c2)
{
if (EQ (charset, Vcharset_ascii))
MAKE_CHAR (Lisp_Object charset, int c1, int c2)
{
if (EQ (charset, Vcharset_ascii))
@@
-748,8
+751,8
@@
MAKE_CHAR (Lisp_Object charset, int c1, int c2)
: ((c1) = CHAR_FIELD2 (c), \
(c2) = CHAR_FIELD3 (c))
: ((c1) = CHAR_FIELD2 (c), \
(c2) = CHAR_FIELD3 (c))
-INLINE void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2);
-INLINE void
+INLINE_HEADER void breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2);
+INLINE_HEADER void
breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
{
*charset = CHAR_CHARSET (c);
breakup_char_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
{
*charset = CHAR_CHARSET (c);
@@
-786,9
+789,9
@@
Emchar Lstream_get_emchar_1 (Lstream *stream, int first_char);
int Lstream_fput_emchar (Lstream *stream, Emchar ch);
void Lstream_funget_emchar (Lstream *stream, Emchar ch);
int Lstream_fput_emchar (Lstream *stream, Emchar ch);
void Lstream_funget_emchar (Lstream *stream, Emchar ch);
-int copy_internal_to_external (CONST Bufbyte *internal, Bytecount len,
+int copy_internal_to_external (const Bufbyte *internal, Bytecount len,
unsigned char *external);
unsigned char *external);
-Bytecount copy_external_to_internal (CONST unsigned char *external,
+Bytecount copy_external_to_internal (const unsigned char *external,
int len, Bufbyte *internal);
#endif /* INCLUDED_mule_charset_h_ */
int len, Bufbyte *internal);
#endif /* INCLUDED_mule_charset_h_ */