comparison src/casefiddle.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 ecf1ebac70d8
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
38 38
39 retry: 39 retry:
40 40
41 if (CHAR_OR_CHAR_INTP (string_or_char)) 41 if (CHAR_OR_CHAR_INTP (string_or_char))
42 { 42 {
43 Emchar c; 43 Ichar c;
44 CHECK_CHAR_COERCE_INT (string_or_char); 44 CHECK_CHAR_COERCE_INT (string_or_char);
45 c = XCHAR (string_or_char); 45 c = XCHAR (string_or_char);
46 c = (flag == CASE_DOWN) ? DOWNCASE (buf, c) : UPCASE (buf, c); 46 c = (flag == CASE_DOWN) ? DOWNCASE (buf, c) : UPCASE (buf, c);
47 return make_char (c); 47 return make_char (c);
48 } 48 }
49 49
50 if (STRINGP (string_or_char)) 50 if (STRINGP (string_or_char))
51 { 51 {
52 Lisp_Object syntax_table = buf->mirror_syntax_table; 52 Lisp_Object syntax_table = buf->mirror_syntax_table;
53 Intbyte *storage = 53 Ibyte *storage =
54 alloca_array (Intbyte, XSTRING_LENGTH (string_or_char) * 54 alloca_array (Ibyte, XSTRING_LENGTH (string_or_char) *
55 MAX_EMCHAR_LEN); 55 MAX_ICHAR_LEN);
56 Intbyte *newp = storage; 56 Ibyte *newp = storage;
57 Intbyte *oldp = XSTRING_DATA (string_or_char); 57 Ibyte *oldp = XSTRING_DATA (string_or_char);
58 Intbyte *endp = oldp + XSTRING_LENGTH (string_or_char); 58 Ibyte *endp = oldp + XSTRING_LENGTH (string_or_char);
59 int wordp = 0, wordp_prev; 59 int wordp = 0, wordp_prev;
60 60
61 while (oldp < endp) 61 while (oldp < endp)
62 { 62 {
63 Emchar c = charptr_emchar (oldp); 63 Ichar c = itext_ichar (oldp);
64 switch (flag) 64 switch (flag)
65 { 65 {
66 case CASE_UP: 66 case CASE_UP:
67 c = UPCASE (buf, c); 67 c = UPCASE (buf, c);
68 break; 68 break;
82 else 82 else
83 c = UPCASE (buf, c); 83 c = UPCASE (buf, c);
84 break; 84 break;
85 } 85 }
86 86
87 newp += set_charptr_emchar (newp, c); 87 newp += set_itext_ichar (newp, c);
88 INC_CHARPTR (oldp); 88 INC_IBYTEPTR (oldp);
89 } 89 }
90 90
91 return make_string (storage, newp - storage); 91 return make_string (storage, newp - storage);
92 } 92 }
93 93
171 mccount = begin_multiple_change (buf, s, e); 171 mccount = begin_multiple_change (buf, s, e);
172 record_change (buf, s, e - s); 172 record_change (buf, s, e - s);
173 173
174 for (pos = s; pos < e; pos++) 174 for (pos = s; pos < e; pos++)
175 { 175 {
176 Emchar oldc = BUF_FETCH_CHAR (buf, pos); 176 Ichar oldc = BUF_FETCH_CHAR (buf, pos);
177 Emchar c = oldc; 177 Ichar c = oldc;
178 178
179 switch (flag) 179 switch (flag)
180 { 180 {
181 case CASE_UP: 181 case CASE_UP:
182 c = UPCASE (buf, oldc); 182 c = UPCASE (buf, oldc);