Mercurial > hg > xemacs-beta
diff src/file-coding.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 | e7ee5f8bde58 |
| children | c925bacdda60 |
line wrap: on
line diff
--- a/src/file-coding.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/file-coding.c Wed Jun 05 09:58:45 2002 +0000 @@ -1018,9 +1018,9 @@ setup_eol_coding_systems (Lisp_Object codesys) { int len = XSTRING_LENGTH (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name); - Intbyte *codesys_name = (Intbyte *) ALLOCA (len + 7); + Ibyte *codesys_name = (Ibyte *) ALLOCA (len + 7); int mlen = -1; - Intbyte *codesys_mnemonic = 0; + Ibyte *codesys_mnemonic = 0; Lisp_Object codesys_name_sym, sub_codesys; int i; @@ -1030,7 +1030,7 @@ if (STRINGP (XCODING_SYSTEM_MNEMONIC (codesys))) { mlen = XSTRING_LENGTH (XCODING_SYSTEM_MNEMONIC (codesys)); - codesys_mnemonic = (Intbyte *) ALLOCA (mlen + 7); + codesys_mnemonic = (Ibyte *) ALLOCA (mlen + 7); memcpy (codesys_mnemonic, XSTRING_DATA (XCODING_SYSTEM_MNEMONIC (codesys)), mlen); } @@ -1144,10 +1144,10 @@ if (prefix) { - Intbyte *newname = + Ibyte *newname = emacs_sprintf_malloc (NULL, "%s-%s-%d", prefix, - NILP (name_or_existing) ? (Intbyte *) "nil" : + NILP (name_or_existing) ? (Ibyte *) "nil" : XSTRING_DATA (Fsymbol_name (XCODING_SYSTEM_NAME (name_or_existing))), ++coding_system_tick); @@ -1262,7 +1262,7 @@ creating will have canonicalization expansion done on it, leading to infinite recursion. So we have to generate a new, internal coding system with the previous value of CANONICAL. */ - Intbyte *newname = + Ibyte *newname = emacs_sprintf_malloc (NULL, "internal-eol-copy-%s-%d", XSTRING_DATA (Fsymbol_name (name_or_existing)), @@ -2950,7 +2950,7 @@ Dynarr_add (dst, c); } #ifdef MULE - else if (intbyte_leading_byte_p (c)) + else if (ibyte_leading_byte_p (c)) { assert (ch == 0); if (c == LEADING_BYTE_LATIN_ISO8859_1 || @@ -3110,7 +3110,7 @@ } static Bytecount -convert_eol_convert (struct coding_stream *str, const Intbyte *src, +convert_eol_convert (struct coding_stream *str, const Ibyte *src, unsigned_char_dynarr *dst, Bytecount n) { if (str->direction == CODING_DECODE) @@ -3121,11 +3121,11 @@ if (data->actual == EOL_AUTODETECT) { Bytecount n2 = n; - const Intbyte *src2 = src; + const Ibyte *src2 = src; for (; n2; n2--) { - Intbyte c = *src2++; + Ibyte c = *src2++; if (c == '\n') { data->actual = EOL_LF; @@ -3164,12 +3164,12 @@ Dynarr_add_many (dst, src, n); else { - const Intbyte *end = src + n; + const Ibyte *end = src + n; while (1) { /* Find the next section with no \r and add it. */ - const Intbyte *runstart = src; - src = (Intbyte *) memchr (src, '\r', end - src); + const Ibyte *runstart = src; + src = (Ibyte *) memchr (src, '\r', end - src); if (!src) src = end; Dynarr_add_many (dst, runstart, src - runstart); @@ -3201,7 +3201,7 @@ { enum eol_type subtype = XCODING_SYSTEM_CONVERT_EOL_SUBTYPE (str->codesys); - const Intbyte *end = src + n; + const Ibyte *end = src + n; /* We try to be relatively efficient here. */ if (subtype == EOL_LF) @@ -3211,8 +3211,8 @@ while (1) { /* Find the next section with no \n and add it. */ - const Intbyte *runstart = src; - src = (Intbyte *) memchr (src, '\n', end - src); + const Ibyte *runstart = src; + src = (Ibyte *) memchr (src, '\n', end - src); if (!src) src = end; Dynarr_add_many (dst, runstart, src - runstart); @@ -3789,11 +3789,11 @@ *(p-1) == ';'))) { Bytecount n; - Intbyte *name; + Ibyte *name; p += LENGTH ("coding:"); while (*p == ' ' || *p == '\t') p++; - name = alloca_intbytes (suffix - p + 1); + name = alloca_ibytes (suffix - p + 1); memcpy (name, p, suffix - p); name[suffix - p] = '\0';