Mercurial > hg > xemacs-beta
diff src/doc.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 | 4542b72c005e |
line wrap: on
line diff
--- a/src/doc.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/doc.c Wed Jun 05 09:58:45 2002 +0000 @@ -46,14 +46,14 @@ Lisp_Object unparesseuxify_doc_string (int fd, EMACS_INT position, - Intbyte *name_nonreloc, Lisp_Object name_reloc, + Ibyte *name_nonreloc, Lisp_Object name_reloc, int standard_doc_file) { - Intbyte buf[512 * 32 + 1]; - Intbyte *buffer = buf; + Ibyte buf[512 * 32 + 1]; + Ibyte *buffer = buf; int buffer_size = sizeof (buf); - Intbyte *from, *to; - REGISTER Intbyte *p = buffer; + Ibyte *from, *to; + REGISTER Ibyte *p = buffer; Lisp_Object return_me; Lisp_Object fdstream = Qnil, instream = Qnil; struct gcpro gcpro1, gcpro2; @@ -97,14 +97,14 @@ /* Switch to a bigger buffer if we need one. */ if (space_left == 0) { - Intbyte *old_buffer = buffer; + Ibyte *old_buffer = buffer; if (buffer == buf) { - buffer = (Intbyte *) xmalloc (buffer_size *= 2); + buffer = (Ibyte *) xmalloc (buffer_size *= 2); memcpy (buffer, old_buffer, p - old_buffer); } else - buffer = (Intbyte *) xrealloc (buffer, buffer_size *= 2); + buffer = (Ibyte *) xrealloc (buffer, buffer_size *= 2); p += buffer - old_buffer; space_left = buffer_size - (p - buffer); } @@ -123,7 +123,7 @@ if (!nread) break; { - Intbyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */ + Ibyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */ if (p1) { *p1 = 0; @@ -194,7 +194,7 @@ get_doc_string (Lisp_Object filepos) { REGISTER int fd; - REGISTER Intbyte *name_nonreloc = 0; + REGISTER Ibyte *name_nonreloc = 0; EMACS_INT position; Lisp_Object file, tem; Lisp_Object name_reloc = Qnil; @@ -235,7 +235,7 @@ /* sizeof ("../lib-src/") == 12 */ if (minsize < 12) minsize = 12; - name_nonreloc = alloca_intbytes (minsize + XSTRING_LENGTH (file) + 8); + name_nonreloc = alloca_ibytes (minsize + XSTRING_LENGTH (file) + 8); string_join (name_nonreloc, Vdoc_directory, file); } else @@ -249,10 +249,10 @@ if (purify_flag) { /* sizeof ("../lib-src/") == 12 */ - name_nonreloc = (Intbyte *) ALLOCA (12 + XSTRING_LENGTH (file) + 8); + name_nonreloc = (Ibyte *) ALLOCA (12 + XSTRING_LENGTH (file) + 8); /* Preparing to dump; DOC file is probably not installed. So check in ../lib-src. */ - qxestrcpy (name_nonreloc, (Intbyte *) "../lib-src/"); + qxestrcpy (name_nonreloc, (Ibyte *) "../lib-src/"); qxestrcat (name_nonreloc, XSTRING_DATA (file)); fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0); @@ -422,7 +422,7 @@ } static void -weird_doc (Lisp_Object sym, const CIntbyte *weirdness, const CIntbyte *type, +weird_doc (Lisp_Object sym, const CIbyte *weirdness, const CIbyte *type, int pos) { if (!strcmp (weirdness, GETTEXT ("duplicate"))) return; @@ -441,12 +441,12 @@ (filename)) { int fd; - Intbyte buf[1024 + 1]; + Ibyte buf[1024 + 1]; REGISTER int filled; REGISTER int pos; - REGISTER Intbyte *p, *end; + REGISTER Ibyte *p, *end; Lisp_Object sym, fun, tem; - Intbyte *name; + Ibyte *name; /* This function should not pass the data it's reading through a coding stream. The reason is that the only purpose of this function is to @@ -467,7 +467,7 @@ if (!NILP (Vdoc_directory)) { CHECK_STRING (Vdoc_directory); - name = alloca_intbytes (XSTRING_LENGTH (filename) + name = alloca_ibytes (XSTRING_LENGTH (filename) + XSTRING_LENGTH (Vdoc_directory) + 1); qxestrcpy (name, XSTRING_DATA (Vdoc_directory)); @@ -475,8 +475,8 @@ else #endif /* CANNOT_DUMP */ { - name = alloca_intbytes (XSTRING_LENGTH (filename) + 14); - qxestrcpy (name, (Intbyte *) "../lib-src/"); + name = alloca_ibytes (XSTRING_LENGTH (filename) + 14); + qxestrcpy (name, (Ibyte *) "../lib-src/"); } qxestrcat (name, XSTRING_DATA (filename)); @@ -801,18 +801,18 @@ (string)) { /* This function can GC */ - Intbyte *buf; + Ibyte *buf; int changed = 0; - REGISTER Intbyte *strdata; - REGISTER Intbyte *bufp; + REGISTER Ibyte *strdata; + REGISTER Ibyte *bufp; Bytecount strlength; Bytecount idx; Bytecount bsize; - Intbyte *new; + Ibyte *new; Lisp_Object tem = Qnil; Lisp_Object keymap = Qnil; Lisp_Object name = Qnil; - Intbyte *start; + Ibyte *start; Bytecount length; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; @@ -847,14 +847,14 @@ strlength = XSTRING_LENGTH (string); bsize = 1 + strlength; - buf = (Intbyte *) xmalloc (bsize); + buf = (Ibyte *) xmalloc (bsize); bufp = buf; /* Have to reset strdata every time GC might be called */ strdata = XSTRING_DATA (string); for (idx = 0; idx < strlength; ) { - Intbyte *strp = strdata + idx; + Ibyte *strp = strdata + idx; if (strp[0] != '\\') { @@ -919,7 +919,7 @@ if (NILP (tem)) /* but not on any keys */ { - new = (Intbyte *) xrealloc (buf, bsize += 4); + new = (Ibyte *) xrealloc (buf, bsize += 4); bufp += new - buf; buf = new; memcpy (bufp, "M-x ", 4); @@ -993,7 +993,7 @@ length = XSTRING_LENGTH (tem); subst: bsize += length; - new = (Intbyte *) xrealloc (buf, bsize); + new = (Ibyte *) xrealloc (buf, bsize); bufp += new - buf; buf = new; memcpy (bufp, start, length);