Mercurial > hg > xemacs-beta
diff src/mule-ccl.c @ 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 | 04bc9d2f42c7 |
line wrap: on
line diff
--- a/src/mule-ccl.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/mule-ccl.c Wed Jun 05 09:58:45 2002 +0000 @@ -728,23 +728,23 @@ } \ else \ { \ - Intbyte work[MAX_EMCHAR_LEN]; \ + Ibyte work[MAX_ICHAR_LEN]; \ int len; \ - len = non_ascii_set_charptr_emchar (work, ch); \ + len = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ else \ { \ - if (!emchar_multibyte_p(ch)) \ + if (!ichar_multibyte_p(ch)) \ { \ Dynarr_add (destination, ch); \ } \ else \ { \ - Intbyte work[MAX_EMCHAR_LEN]; \ + Ibyte work[MAX_ICHAR_LEN]; \ int len; \ - len = non_ascii_set_charptr_emchar (work, ch); \ + len = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -755,7 +755,7 @@ cannot handle a multibyte string except for Control-1 characters. */ #define CCL_WRITE_STRING(len) \ do { \ - Intbyte work[MAX_EMCHAR_LEN]; \ + Ibyte work[MAX_ICHAR_LEN]; \ int ch, bytes; \ if (!destination) \ CCL_INVALID_CMD; \ @@ -783,7 +783,7 @@ } \ else \ { \ - bytes = non_ascii_set_charptr_emchar (work, ch); \ + bytes = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -794,13 +794,13 @@ { \ ch = ((XINT (ccl_prog[ic + (i / 3)])) \ >> ((2 - (i % 3)) * 8)) & 0xFF; \ - if (!emchar_multibyte_p(ch)) \ + if (!ichar_multibyte_p(ch)) \ { \ Dynarr_add (destination, ch); \ } \ else \ { \ - bytes = non_ascii_set_charptr_emchar (work, ch); \ + bytes = non_ascii_set_itext_ichar (work, ch); \ Dynarr_add_many (destination, work, len); \ } \ } \ @@ -828,7 +828,7 @@ /* Set C to the character code made from CHARSET and CODE. This is - like make_emchar but check the validity of CHARSET and CODE. If they + like make_ichar but check the validity of CHARSET and CODE. If they are not valid, set C to (CODE & 0xFF) because that is usually the case that CCL_ReadMultibyteChar2 read an invalid code and it set CODE to that invalid byte. */ @@ -848,7 +848,7 @@ \ if ((code) >= 256) \ c2 = c1, c1 = ((code) >> 7) & 0x7F; \ - (c) = make_emchar (charset, c1, c2); \ + (c) = make_ichar (charset, c1, c2); \ } \ else \ (c) = (code) & 0xFF; \