Mercurial > hg > xemacs-beta
diff src/bytecode.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 | 2b6fa2618f76 |
| children | 79c6ff3eef26 |
line wrap: on
line diff
--- a/src/bytecode.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/bytecode.c Wed Jun 05 09:58:45 2002 +0000 @@ -1410,7 +1410,7 @@ DOESNT_RETURN -invalid_byte_code (const CIntbyte *reason, Lisp_Object frob) +invalid_byte_code (const CIbyte *reason, Lisp_Object frob) { signal_error (Qinvalid_byte_code, reason, frob); } @@ -1439,8 +1439,8 @@ /* Get next character from Lisp instructions string. */ #define READ_INSTRUCTION_CHAR(lvalue) do { \ - (lvalue) = charptr_emchar (ptr); \ - INC_CHARPTR (ptr); \ + (lvalue) = itext_ichar (ptr); \ + INC_IBYTEPTR (ptr); \ *icounts_ptr++ = program_ptr - program; \ if (lvalue > UCHAR_MAX) \ invalid_byte_code \ @@ -1546,8 +1546,8 @@ Opbyte *program_ptr = program; - const Intbyte *ptr = XSTRING_DATA (instructions); - const Intbyte * const end = ptr + instructions_length; + const Ibyte *ptr = XSTRING_DATA (instructions); + const Ibyte * const end = ptr + instructions_length; *varbind_count = 0; @@ -1994,9 +1994,9 @@ /* Invert action performed by optimize_byte_code() */ Lisp_Opaque *opaque = XOPAQUE (f->instructions); - Intbyte * const buffer = - alloca_array (Intbyte, OPAQUE_SIZE (opaque) * MAX_EMCHAR_LEN); - Intbyte *bp = buffer; + Ibyte * const buffer = + alloca_array (Ibyte, OPAQUE_SIZE (opaque) * MAX_ICHAR_LEN); + Ibyte *bp = buffer; const Opbyte * const program = (const Opbyte *) OPAQUE_DATA (opaque); const Opbyte *program_ptr = program; @@ -2005,7 +2005,7 @@ while (program_ptr < program_end) { Opcode opcode = (Opcode) READ_UINT_1; - bp += set_charptr_emchar (bp, opcode); + bp += set_itext_ichar (bp, opcode); switch (opcode) { case Bvarref+7: @@ -2014,8 +2014,8 @@ case Bcall+7: case Bunbind+7: case Bconstant2: - bp += set_charptr_emchar (bp, READ_UINT_1); - bp += set_charptr_emchar (bp, READ_UINT_1); + bp += set_itext_ichar (bp, READ_UINT_1); + bp += set_itext_ichar (bp, READ_UINT_1); break; case Bvarref+6: @@ -2026,7 +2026,7 @@ case BlistN: case BconcatN: case BinsertN: - bp += set_charptr_emchar (bp, READ_UINT_1); + bp += set_itext_ichar (bp, READ_UINT_1); break; case Bgoto: @@ -2040,8 +2040,8 @@ Opbyte *buf2p = buf2; /* Convert back to program-relative address */ WRITE_INT16 (jump + (program_ptr - 2 - program), buf2p); - bp += set_charptr_emchar (bp, buf2[0]); - bp += set_charptr_emchar (bp, buf2[1]); + bp += set_itext_ichar (bp, buf2[0]); + bp += set_itext_ichar (bp, buf2[1]); break; } @@ -2050,7 +2050,7 @@ case BRgotoifnonnil: case BRgotoifnilelsepop: case BRgotoifnonnilelsepop: - bp += set_charptr_emchar (bp, READ_INT_1 + 127); + bp += set_itext_ichar (bp, READ_INT_1 + 127); break; default: