Mercurial > hg > xemacs-beta
diff src/charset.h @ 867:804517e16990
[xemacs-hg @ 2002-06-05 09:54:39 by ben]
Textual renaming: text/char names
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization.
[a] distinguish between "charptr" when it refers to operations on
the pointer itself and when it refers to operations on text; and
[b] use consistent naming for everything referring to internal
format, i.e.
Itext == text in internal format
Ibyte == a byte in such text
Ichar == a char as represented in internal character format
thus e.g.
set_charptr_emchar -> set_itext_ichar
The pre and post tags on either side of this change are:
pre-internal-format-textual-renaming
post-internal-format-textual-renaming
See the Internals Manual for details of exactly how this was done,
how to handle the change in your workspace, etc.
| author | ben |
|---|---|
| date | Wed, 05 Jun 2002 09:58:45 +0000 |
| parents | 6728e641994e |
| children | 184461bc8de4 |
line wrap: on
line diff
--- a/src/charset.h Tue Jun 04 17:40:00 2002 +0000 +++ b/src/charset.h Wed Jun 05 09:58:45 2002 +0000 @@ -40,10 +40,10 @@ #define Vcharset_ascii Qnil -#define emchar_charset(ch) Vcharset_ascii -#define emchar_leading_byte(ch) LEADING_BYTE_ASCII -#define emchar_len(ch) 1 -#define emchar_len_fmt(ch, fmt) 1 +#define ichar_charset(ch) Vcharset_ascii +#define ichar_leading_byte(ch) LEADING_BYTE_ASCII +#define ichar_len(ch) 1 +#define ichar_len_fmt(ch, fmt) 1 #define LEADING_BYTE_ASCII 0x80 #define NUM_LEADING_BYTES 1 #define MIN_LEADING_BYTE 0x80 @@ -53,7 +53,7 @@ #define XCHARSET_GRAPHIC(cs) -1 #define XCHARSET_COLUMNS(cs) 1 #define XCHARSET_DIMENSION(cs) 1 -#define BREAKUP_EMCHAR(ch, charset, byte1, byte2) do { \ +#define BREAKUP_ICHAR(ch, charset, byte1, byte2) do { \ (charset) = Vcharset_ascii; \ (byte1) = (ch); \ (byte2) = 0; \ @@ -159,7 +159,7 @@ DECLARE_INLINE_HEADER ( int -leading_byte_prefix_p (Intbyte lb) +leading_byte_prefix_p (Ibyte lb) ) { return (lb == PRE_LEADING_BYTE_PRIVATE_1 || @@ -228,7 +228,7 @@ unsigned char unicode_table_loaded; /* Final byte of this character set in ISO2022 designating escape sequence */ - Intbyte final; + Ibyte final; /* Number of bytes (1 - 4) required in the internal representation for characters in this character set. This is *not* the @@ -279,7 +279,7 @@ /* Leading byte and id have been regrouped. -- OG */ #define CHARSET_ID(cs) ((cs)->id) -#define CHARSET_LEADING_BYTE(cs) ((Intbyte) CHARSET_ID (cs)) +#define CHARSET_LEADING_BYTE(cs) ((Ibyte) CHARSET_ID (cs)) #define CHARSET_NAME(cs) ((cs)->name) #define CHARSET_SHORT_NAME(cs) ((cs)->short_name) #define CHARSET_LONG_NAME(cs) ((cs)->long_name) @@ -335,8 +335,8 @@ /* Table of charsets indexed by type/final-byte/direction. */ Lisp_Object charset_by_attributes[4][128][2]; - Intbyte next_allocated_1_byte_leading_byte; - Intbyte next_allocated_2_byte_leading_byte; + Ibyte next_allocated_1_byte_leading_byte; + Ibyte next_allocated_2_byte_leading_byte; }; DECLARE_INLINE_HEADER ( @@ -376,15 +376,15 @@ /* The bit fields of character are divided into 3 parts: FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ -#define EMCHAR_FIELD1_MASK (0x1F << 14) -#define EMCHAR_FIELD2_MASK (0x7F << 7) -#define EMCHAR_FIELD3_MASK 0x7F +#define ICHAR_FIELD1_MASK (0x1F << 14) +#define ICHAR_FIELD2_MASK (0x7F << 7) +#define ICHAR_FIELD3_MASK 0x7F /* Macros to access each field of a character code of C. */ -#define emchar_field1(c) (((c) & EMCHAR_FIELD1_MASK) >> 14) -#define emchar_field2(c) (((c) & EMCHAR_FIELD2_MASK) >> 7) -#define emchar_field3(c) ((c) & EMCHAR_FIELD3_MASK) +#define ichar_field1(c) (((c) & ICHAR_FIELD1_MASK) >> 14) +#define ichar_field2(c) (((c) & ICHAR_FIELD2_MASK) >> 7) +#define ichar_field3(c) ((c) & ICHAR_FIELD3_MASK) /* Field 1, if non-zero, usually holds a leading byte for a dimension-2 charset. Field 2, if non-zero, usually holds a leading @@ -400,32 +400,32 @@ /* Minimum and maximum allowed values for the fields. */ -#define MIN_EMCHAR_FIELD2_OFFICIAL \ +#define MIN_ICHAR_FIELD2_OFFICIAL \ (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) -#define MAX_EMCHAR_FIELD2_OFFICIAL \ +#define MAX_ICHAR_FIELD2_OFFICIAL \ (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE) -#define MIN_EMCHAR_FIELD1_OFFICIAL \ +#define MIN_ICHAR_FIELD1_OFFICIAL \ (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) -#define MAX_EMCHAR_FIELD1_OFFICIAL \ +#define MAX_ICHAR_FIELD1_OFFICIAL \ (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE) -#define MIN_EMCHAR_FIELD2_PRIVATE \ +#define MIN_ICHAR_FIELD2_PRIVATE \ (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) -#define MAX_EMCHAR_FIELD2_PRIVATE \ +#define MAX_ICHAR_FIELD2_PRIVATE \ (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE) -#define MIN_EMCHAR_FIELD1_PRIVATE \ +#define MIN_ICHAR_FIELD1_PRIVATE \ (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) -#define MAX_EMCHAR_FIELD1_PRIVATE \ +#define MAX_ICHAR_FIELD1_PRIVATE \ (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE) /* Minimum character code of each <type> character. */ -#define MIN_CHAR_OFFICIAL_TYPE9N (MIN_EMCHAR_FIELD2_OFFICIAL << 7) -#define MIN_CHAR_PRIVATE_TYPE9N (MIN_EMCHAR_FIELD2_PRIVATE << 7) -#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_EMCHAR_FIELD1_OFFICIAL << 14) -#define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_EMCHAR_FIELD1_PRIVATE << 14) +#define MIN_CHAR_OFFICIAL_TYPE9N (MIN_ICHAR_FIELD2_OFFICIAL << 7) +#define MIN_CHAR_PRIVATE_TYPE9N (MIN_ICHAR_FIELD2_PRIVATE << 7) +#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_ICHAR_FIELD1_OFFICIAL << 14) +#define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_ICHAR_FIELD1_PRIVATE << 14) #define MIN_CHAR_COMPOSITION (0x1F << 14) /* Leading byte of a character. @@ -436,20 +436,20 @@ */ DECLARE_INLINE_HEADER ( -Intbyte -emchar_leading_byte (Emchar c) +Ibyte +ichar_leading_byte (Ichar c) ) { - if (emchar_ascii_p (c)) + if (ichar_ascii_p (c)) return LEADING_BYTE_ASCII; else if (c < 0xA0) return LEADING_BYTE_CONTROL_1; else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) - return emchar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; + return ichar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE; else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N) - return emchar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; + return ichar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE; else if (c < MIN_CHAR_COMPOSITION) - return emchar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; + return ichar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE; else { #ifdef ENABLE_COMPOSITE_CHARS @@ -463,10 +463,10 @@ DECLARE_INLINE_HEADER ( Bytecount -emchar_len (Emchar c) +ichar_len (Ichar c) ) { - if (emchar_ascii_p (c)) + if (ichar_ascii_p (c)) return 1; else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N) return 2; @@ -487,13 +487,13 @@ DECLARE_INLINE_HEADER ( Bytecount -emchar_len_fmt (Emchar c, Internal_Format fmt) +ichar_len_fmt (Ichar c, Internal_Format fmt) ) { switch (fmt) { case FORMAT_DEFAULT: - return emchar_len (c); + return ichar_len (c); case FORMAT_16_BIT_FIXED: return 2; case FORMAT_32_BIT_FIXED: @@ -504,7 +504,7 @@ } } -#define emchar_charset(c) charset_by_leading_byte (emchar_leading_byte (c)) +#define ichar_charset(c) charset_by_leading_byte (ichar_leading_byte (c)) /* Return a character whose charset is CHARSET and position-codes are C1 and C2. TYPE9N character ignores C2. (For typical charsets, i.e. not @@ -517,11 +517,11 @@ */ DECLARE_INLINE_HEADER ( -Emchar -make_emchar (Lisp_Object charset, int c1, int c2) +Ichar +make_ichar (Lisp_Object charset, int c1, int c2) ) { - Emchar retval; + Ichar retval; if (EQ (charset, Vcharset_ascii)) retval = c1; else if (EQ (charset, Vcharset_control_1)) @@ -539,40 +539,40 @@ else retval = ((XCHARSET_LEADING_BYTE (charset) - FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2); - text_checking_assert (valid_emchar_p (retval)); + text_checking_assert (valid_ichar_p (retval)); return retval; } -/* BREAKUP_EMCHAR_1_UNSAFE assumes that the charset has already been +/* BREAKUP_ICHAR_1_UNSAFE assumes that the charset has already been calculated, and just computes c1 and c2. - BREAKUP_EMCHAR also computes and stores the charset. */ + BREAKUP_ICHAR also computes and stores the charset. */ -#define BREAKUP_EMCHAR_1_UNSAFE(c, charset, c1, c2) \ +#define BREAKUP_ICHAR_1_UNSAFE(c, charset, c1, c2) \ XCHARSET_DIMENSION (charset) == 1 \ - ? ((c1) = emchar_field3 (c), (c2) = 0) \ - : ((c1) = emchar_field2 (c), \ - (c2) = emchar_field3 (c)) + ? ((c1) = ichar_field3 (c), (c2) = 0) \ + : ((c1) = ichar_field2 (c), \ + (c2) = ichar_field3 (c)) DECLARE_INLINE_HEADER ( void -breakup_emchar_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2) +breakup_ichar_1 (Ichar c, Lisp_Object *charset, int *c1, int *c2) ) { - text_checking_assert (valid_emchar_p (c)); - *charset = emchar_charset (c); - BREAKUP_EMCHAR_1_UNSAFE (c, *charset, *c1, *c2); + text_checking_assert (valid_ichar_p (c)); + *charset = ichar_charset (c); + BREAKUP_ICHAR_1_UNSAFE (c, *charset, *c1, *c2); } -/* BREAKUP_EMCHAR separates an Emchar into its components. The charset of +/* BREAKUP_ICHAR separates an Ichar into its components. The charset of character C is set to CHARSET, and the position-codes of C are set to C1 and C2. C2 of TYPE9N character is 0. */ -#define BREAKUP_EMCHAR(c, charset, c1, c2) \ - breakup_emchar_1 (c, &(charset), &(c1), &(c2)) +#define BREAKUP_ICHAR(c, charset, c1, c2) \ + breakup_ichar_1 (c, &(charset), &(c1), &(c2)) void get_charset_limits (Lisp_Object charset, int *low, int *high); -int emchar_to_unicode (Emchar chr); +int ichar_to_unicode (Ichar chr); #endif /* MULE */