Mercurial > hg > xemacs-beta
diff src/syntax.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 | 79c6ff3eef26 |
line wrap: on
line diff
--- a/src/syntax.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/syntax.c Wed Jun 05 09:58:45 2002 +0000 @@ -93,7 +93,7 @@ struct lisp_parse_state { int depth; /* Depth at end of parsing */ - Emchar instring; /* -1 if not within string, else desired terminator */ + Ichar instring; /* -1 if not within string, else desired terminator */ int incomment; /* Nonzero if within a comment at end of parsing */ int comstyle; /* comment style a=0, or b=1, or ST_COMMENT_STYLE */ int quoted; /* Nonzero if just after an escape char at end of @@ -590,7 +590,7 @@ #endif Lisp_Object -syntax_match (Lisp_Object syntax_table, Emchar ch) +syntax_match (Lisp_Object syntax_table, Ichar ch) { Lisp_Object code = get_char_table (ch, syntax_table); Lisp_Object code2 = code; @@ -631,7 +631,7 @@ There is no word boundary between two word-constituent ASCII characters. */ #define WORD_BOUNDARY_P(c1, c2) \ - (!(emchar_ascii_p (c1) && emchar_ascii_p (c2)) \ + (!(ichar_ascii_p (c1) && ichar_ascii_p (c2)) \ && word_boundary_p (c1, c2)) #endif @@ -643,7 +643,7 @@ scan_words (struct buffer *buf, Charbpos from, int count) { Charbpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf); - Emchar ch0, ch1; + Ichar ch0, ch1; enum syntaxcode code; struct syntax_cache *scache = setup_buffer_syntax_cache (buf, from, count); @@ -790,7 +790,7 @@ find_start_of_comment (struct buffer *buf, Charbpos from, Charbpos stop, int comstyle) { - Emchar c; + Ichar c; enum syntaxcode code; /* Look back, counting the parity of string-quotes, @@ -803,7 +803,7 @@ which is I+2X quotes from the comment-end. PARITY is current parity of quotes from the comment end. */ int parity = 0; - Emchar my_stringend = 0; + Ichar my_stringend = 0; int string_lossage = 0; Charbpos comment_end = from; Charbpos comstart_pos = 0; @@ -1065,7 +1065,7 @@ { Charbpos from; Charbpos stop; - Emchar c; + Ichar c; enum syntaxcode code; int syncode; EMACS_INT n; @@ -1255,7 +1255,7 @@ int sexpflag, int noerror) { Charbpos stop; - Emchar c; + Ichar c; int quoted; int mathexit = 0; enum syntaxcode code; @@ -1400,12 +1400,12 @@ case Sstring_fence: case Sstring: { - Emchar stringterm; + Ichar stringterm; if (code != Sstring_fence) { /* XEmacs change: call syntax_match on character */ - Emchar ch = BUF_FETCH_CHAR (buf, from - 1); + Ichar ch = BUF_FETCH_CHAR (buf, from - 1); Lisp_Object stermobj = syntax_match (scache->current_syntax_table, ch); @@ -1580,12 +1580,12 @@ case Sstring_fence: case Sstring: { - Emchar stringterm; + Ichar stringterm; if (code != Sstring_fence) { /* XEmacs change: call syntax_match() on character */ - Emchar ch = BUF_FETCH_CHAR (buf, from); + Ichar ch = BUF_FETCH_CHAR (buf, from); Lisp_Object stermobj = syntax_match (scache->current_syntax_table, ch); @@ -1736,7 +1736,7 @@ struct buffer *buf = decode_buffer (buffer, 0); Charbpos beg = BUF_BEGV (buf); Charbpos pos = BUF_PT (buf); - Emchar c = '\0'; /* initialize to avoid compiler warnings */ + Ichar c = '\0'; /* initialize to avoid compiler warnings */ struct syntax_cache *scache; scache = setup_buffer_syntax_cache (buf, pos, -1); @@ -1862,7 +1862,7 @@ while (from < end) { - Emchar c; + Ichar c; int syncode; QUIT; @@ -2010,7 +2010,7 @@ else { /* XEmacs change: call syntax_match() on character */ - Emchar ch = BUF_FETCH_CHAR (buf, from - 1); + Ichar ch = BUF_FETCH_CHAR (buf, from - 1); Lisp_Object stermobj = syntax_match (scache->current_syntax_table, ch); @@ -2377,7 +2377,7 @@ void complex_vars_of_syntax (void) { - Emchar i; + Ichar i; const char *p; /* Set this now, so first buffer creation can refer to it. */ /* Make it nil before calling copy-syntax-table