Mercurial > hg > xemacs-beta

comparison src/lstream.h @ 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 6728e641994e
children e22b0213b713
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
353 #define Lstream_data(stream) ((void *) ((stream)->data)) 353 #define Lstream_data(stream) ((void *) ((stream)->data))
354 #define Lstream_byte_count(stream) ((stream)->byte_count) 354 #define Lstream_byte_count(stream) ((stream)->byte_count)
355 355
356 356
357 /************************************************************************/ 357 /************************************************************************/
358 /* working with an Lstream as a stream of Emchars */ 358 /* working with an Lstream as a stream of Ichars */
359 /************************************************************************/ 359 /************************************************************************/
360 360
361 #ifdef MULE 361 #ifdef MULE
362 362
363 DECLARE_INLINE_HEADER ( 363 DECLARE_INLINE_HEADER (
364 Emchar 364 Ichar
365 Lstream_get_emchar (Lstream *stream) 365 Lstream_get_ichar (Lstream *stream)
366 ) 366 )
367 { 367 {
368 int c = Lstream_getc (stream); 368 int c = Lstream_getc (stream);
369 return (c < 0x80 /* c == EOF || byte_ascii_p (c) */ 369 return (c < 0x80 /* c == EOF || byte_ascii_p (c) */
370 ? (Emchar) c 370 ? (Ichar) c
371 : Lstream_get_emchar_1 (stream, c)); 371 : Lstream_get_ichar_1 (stream, c));
372 } 372 }
373 373
374 /* Write an Emchar to a stream. Return value is 0 for success, -1 for 374 /* Write an Ichar to a stream. Return value is 0 for success, -1 for
375 failure. */ 375 failure. */
376 376
377 DECLARE_INLINE_HEADER ( 377 DECLARE_INLINE_HEADER (
378 int 378 int
379 Lstream_put_emchar (Lstream *stream, Emchar ch) 379 Lstream_put_ichar (Lstream *stream, Ichar ch)
380 ) 380 )
381 { 381 {
382 return emchar_ascii_p (ch) ? 382 return ichar_ascii_p (ch) ?
383 Lstream_putc (stream, ch) : 383 Lstream_putc (stream, ch) :
384 Lstream_fput_emchar (stream, ch); 384 Lstream_fput_ichar (stream, ch);
385 } 385 }
386 386
387 DECLARE_INLINE_HEADER ( 387 DECLARE_INLINE_HEADER (
388 void 388 void
389 Lstream_unget_emchar (Lstream *stream, Emchar ch) 389 Lstream_unget_ichar (Lstream *stream, Ichar ch)
390 ) 390 )
391 { 391 {
392 if (emchar_ascii_p (ch)) 392 if (ichar_ascii_p (ch))
393 Lstream_ungetc (stream, ch); 393 Lstream_ungetc (stream, ch);
394 else 394 else
395 Lstream_funget_emchar (stream, ch); 395 Lstream_funget_ichar (stream, ch);
396 } 396 }
397 #else /* not MULE */ 397 #else /* not MULE */
398 398
399 # define Lstream_get_emchar(stream) Lstream_getc (stream) 399 # define Lstream_get_ichar(stream) Lstream_getc (stream)
400 # define Lstream_put_emchar(stream, ch) Lstream_putc (stream, ch) 400 # define Lstream_put_ichar(stream, ch) Lstream_putc (stream, ch)
401 # define Lstream_unget_emchar(stream, ch) Lstream_ungetc (stream, ch) 401 # define Lstream_unget_ichar(stream, ch) Lstream_ungetc (stream, ch)
402 402
403 #endif /* not MULE */ 403 #endif /* not MULE */
404 404
405 405
406 /************************************************************************/ 406 /************************************************************************/
431 int flags); 431 int flags);
432 Lisp_Object make_filedesc_output_stream (int filedesc, int offset, int count, 432 Lisp_Object make_filedesc_output_stream (int filedesc, int offset, int count,
433 int flags); 433 int flags);
434 void filedesc_stream_set_pty_flushing (Lstream *stream, 434 void filedesc_stream_set_pty_flushing (Lstream *stream,
435 int pty_max_bytes, 435 int pty_max_bytes,
436 Intbyte eof_char); 436 Ibyte eof_char);
437 int filedesc_stream_fd (Lstream *stream); 437 int filedesc_stream_fd (Lstream *stream);
438 Lisp_Object make_lisp_string_input_stream (Lisp_Object string, 438 Lisp_Object make_lisp_string_input_stream (Lisp_Object string,
439 Bytecount offset, 439 Bytecount offset,
440 Bytecount len); 440 Bytecount len);
441 Lisp_Object make_fixed_buffer_input_stream (const void *buf, 441 Lisp_Object make_fixed_buffer_input_stream (const void *buf,