Mercurial > hg > xemacs-beta

comparison src/abbrev.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 ecf1ebac70d8
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
113 } 113 }
114 /* If `bar' is an abbrev, and a user presses `fubar<SPC>', we don't 114 /* If `bar' is an abbrev, and a user presses `fubar<SPC>', we don't
115 normally want to expand it. OTOH, if the abbrev begins with 115 normally want to expand it. OTOH, if the abbrev begins with
116 non-word syntax (e.g. `#if'), it is OK to abbreviate it anywhere. */ 116 non-word syntax (e.g. `#if'), it is OK to abbreviate it anywhere. */
117 if (abbrev_length < closure->maxlen && abbrev_length > 0 117 if (abbrev_length < closure->maxlen && abbrev_length > 0
118 && (WORD_SYNTAX_P (closure->chartab, string_emchar (abbrev, 0))) 118 && (WORD_SYNTAX_P (closure->chartab, string_ichar (abbrev, 0)))
119 && (WORD_SYNTAX_P (closure->chartab, 119 && (WORD_SYNTAX_P (closure->chartab,
120 BUF_FETCH_CHAR (closure->buf, 120 BUF_FETCH_CHAR (closure->buf,
121 closure->point - 121 closure->point -
122 (abbrev_length + 1))))) 122 (abbrev_length + 1)))))
123 { 123 {
124 return 0; 124 return 0;
125 } 125 }
126 /* Match abbreviation string against buffer text. */ 126 /* Match abbreviation string against buffer text. */
127 { 127 {
128 Intbyte *ptr = XSTRING_DATA (abbrev); 128 Ibyte *ptr = XSTRING_DATA (abbrev);
129 Charcount idx; 129 Charcount idx;
130 130
131 for (idx = 0; idx < abbrev_length; idx++) 131 for (idx = 0; idx < abbrev_length; idx++)
132 { 132 {
133 if (DOWNCASE (closure->buf, 133 if (DOWNCASE (closure->buf,
134 BUF_FETCH_CHAR (closure->buf, 134 BUF_FETCH_CHAR (closure->buf,
135 closure->point - abbrev_length + idx)) 135 closure->point - abbrev_length + idx))
136 != DOWNCASE (closure->buf, charptr_emchar (ptr))) 136 != DOWNCASE (closure->buf, itext_ichar (ptr)))
137 { 137 {
138 break; 138 break;
139 } 139 }
140 INC_CHARPTR (ptr); 140 INC_IBYTEPTR (ptr);
141 } 141 }
142 if (idx == abbrev_length) 142 if (idx == abbrev_length)
143 { 143 {
144 /* This is the one. */ 144 /* This is the one. */
145 closure->found = sym; 145 closure->found = sym;
181 abbrev_match() was still fast enough for normal operation. */ 181 abbrev_match() was still fast enough for normal operation. */
182 static Lisp_Symbol * 182 static Lisp_Symbol *
183 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray) 183 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
184 { 184 {
185 Charbpos wordstart, wordend; 185 Charbpos wordstart, wordend;
186 Intbyte *word, *p; 186 Ibyte *word, *p;
187 Charbpos idx; 187 Charbpos idx;
188 Lisp_Object lookup; 188 Lisp_Object lookup;
189 189
190 CHECK_VECTOR (obarray); 190 CHECK_VECTOR (obarray);
191 191
229 } 229 }
230 230
231 if (wordend <= wordstart) 231 if (wordend <= wordstart)
232 return 0; 232 return 0;
233 233
234 p = word = (Intbyte *) ALLOCA (MAX_EMCHAR_LEN * (wordend - wordstart)); 234 p = word = (Ibyte *) ALLOCA (MAX_ICHAR_LEN * (wordend - wordstart));
235 for (idx = wordstart; idx < wordend; idx++) 235 for (idx = wordstart; idx < wordend; idx++)
236 { 236 {
237 Emchar c = BUF_FETCH_CHAR (buf, idx); 237 Ichar c = BUF_FETCH_CHAR (buf, idx);
238 if (UPPERCASEP (buf, c)) 238 if (UPPERCASEP (buf, c))
239 c = DOWNCASE (buf, c); 239 c = DOWNCASE (buf, c);
240 p += set_charptr_emchar (p, c); 240 p += set_itext_ichar (p, c);
241 } 241 }
242 lookup = oblookup (obarray, word, p - word); 242 lookup = oblookup (obarray, word, p - word);
243 if (SYMBOLP (lookup) && !NILP (symbol_value (XSYMBOL (lookup)))) 243 if (SYMBOLP (lookup) && !NILP (symbol_value (XSYMBOL (lookup))))
244 return XSYMBOL (lookup); 244 return XSYMBOL (lookup);
245 else 245 else
248 248
249 /* Return non-zero if OBARRAY contains an interned symbol ` '. */ 249 /* Return non-zero if OBARRAY contains an interned symbol ` '. */
250 static int 250 static int
251 obarray_has_blank_p (Lisp_Object obarray) 251 obarray_has_blank_p (Lisp_Object obarray)
252 { 252 {
253 return !ZEROP (oblookup (obarray, (Intbyte *)" ", 1)); 253 return !ZEROP (oblookup (obarray, (Ibyte *)" ", 1));
254 } 254 }
255 255
256 /* Analyze case in the buffer substring, and report it. */ 256 /* Analyze case in the buffer substring, and report it. */
257 static void 257 static void
258 abbrev_count_case (struct buffer *buf, Charbpos pos, Charcount length, 258 abbrev_count_case (struct buffer *buf, Charbpos pos, Charcount length,
259 int *lccount, int *uccount) 259 int *lccount, int *uccount)
260 { 260 {
261 *lccount = *uccount = 0; 261 *lccount = *uccount = 0;
262 while (length--) 262 while (length--)
263 { 263 {
264 Emchar c = BUF_FETCH_CHAR (buf, pos); 264 Ichar c = BUF_FETCH_CHAR (buf, pos);
265 if (UPPERCASEP (buf, c)) 265 if (UPPERCASEP (buf, c))
266 ++*uccount; 266 ++*uccount;
267 else if (LOWERCASEP (buf, c)) 267 else if (LOWERCASEP (buf, c))
268 ++*lccount; 268 ++*lccount;
269 ++pos; 269 ++pos;