Mercurial > hg > xemacs-beta
diff src/lstream.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 | 1e4e42de23d5 |
| children | c925bacdda60 |
line wrap: on
line diff
--- a/src/lstream.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/lstream.c Wed Jun 05 09:58:45 2002 +0000 @@ -313,7 +313,7 @@ /* Go back to the beginning of the last (and possibly partial) character, and bump forward to see if the character is complete. */ - VALIDATE_CHARPTR_BACKWARD (dataend); + VALIDATE_IBYTEPTR_BACKWARD (dataend); if (dataend + rep_bytes_by_first_byte (*dataend) != data + size) /* If not, chop the size down to ignore the last char and stash it away for next time. */ @@ -674,7 +674,7 @@ /* It's quite possible for us to get passed an incomplete character at the end. We need to spit back that incomplete character. */ - Bytecount newoff = validate_intbyte_string_backward (p, off); + Bytecount newoff = validate_ibyte_string_backward (p, off); if (newoff < off) { Lstream_unread (lstr, p + newoff, off - newoff); @@ -984,7 +984,7 @@ { int fd; int pty_max_bytes; - Intbyte eof_char; + Ibyte eof_char; int starting_pos; int current_pos; int end_pos; @@ -1182,7 +1182,7 @@ in pty-flushing mode. */ if (need_newline) { - Intbyte nl = '\n'; + Ibyte nl = '\n'; Bytecount retval2 = str->allow_quit ? write_allowing_quit (str->fd, &nl, 1) : retry_write (str->fd, &nl, 1); @@ -1265,7 +1265,7 @@ void filedesc_stream_set_pty_flushing (Lstream *stream, int pty_max_bytes, - Intbyte eof_char) + Ibyte eof_char) { struct filedesc_stream *str = FILEDESC_STREAM_DATA (stream); str->pty_max_bytes = pty_max_bytes; @@ -1323,15 +1323,15 @@ struct lisp_string_stream *str = LISP_STRING_STREAM_DATA (stream); /* Don't lose if the string shrank past us ... */ Bytecount offset = min (str->offset, XSTRING_LENGTH (str->obj)); - Intbyte *strstart = XSTRING_DATA (str->obj); - Intbyte *start = strstart + offset; + Ibyte *strstart = XSTRING_DATA (str->obj); + Ibyte *start = strstart + offset; /* ... or if someone changed the string and we ended up in the middle of a character. */ /* Being in the middle of a character is `normal' unless LSTREAM_NO_PARTIAL_CHARS - mrb */ if (stream->flags & LSTREAM_FL_NO_PARTIAL_CHARS) - VALIDATE_CHARPTR_BACKWARD (start); + VALIDATE_IBYTEPTR_BACKWARD (start); offset = start - strstart; size = min (size, (Bytecount) (str->end - offset)); memcpy (data, start, size); @@ -1351,9 +1351,9 @@ /* ... or if someone changed the string and we ended up in the middle of a character. */ { - Intbyte *strstart = XSTRING_DATA (str->obj); - Intbyte *start = strstart + pos; - VALIDATE_CHARPTR_BACKWARD (start); + Ibyte *strstart = XSTRING_DATA (str->obj); + Ibyte *start = strstart + pos; + VALIDATE_IBYTEPTR_BACKWARD (start); pos = start - strstart; } str->offset = pos; @@ -1521,7 +1521,7 @@ /* Note: If you have a dynarr whose type is not unsigned_char_dynarr but which is really just an unsigned_char_dynarr (e.g. its type - is Intbyte or Extbyte), just cast to unsigned_char_dynarr. */ + is Ibyte or Extbyte), just cast to unsigned_char_dynarr. */ #define DYNARR_STREAM_DATA(stream) \ LSTREAM_TYPE_DATA (stream, dynarr) @@ -1664,7 +1664,7 @@ } static Bytecount -lisp_buffer_reader (Lstream *stream, Intbyte *data, Bytecount size) +lisp_buffer_reader (Lstream *stream, Ibyte *data, Bytecount size) { struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream); Bytebpos start; @@ -1692,7 +1692,7 @@ if (EQ (buf->selective_display, Qt) && str->flags & LSTR_SELECTIVE) { /* What a kludge. What a kludge. What a kludge. */ - Intbyte *p; + Ibyte *p; for (p = data; p < data + src_used; p++) if (*p == '\r') *p = '\n'; @@ -1703,7 +1703,7 @@ } static Bytecount -lisp_buffer_writer (Lstream *stream, const Intbyte *data, +lisp_buffer_writer (Lstream *stream, const Ibyte *data, Bytecount size) { struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream);