mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-03 05:20:16 +02:00
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c, mbstrings.c. (modinclude_HEADERS): Removed extchrs.h, mbstrings.h. * unif.c (scm_vector_set_length_x): Don't handle multibyte strings. * tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed. (scm_tag): Don't handle multibyte strings. * read.c: Don't include mbstrings.h. (scm_lreadr): Don't handle multibyte ports. * kw.c: Don't include mbstrings.h. * init.c: Don't include mbstrings.h. (scm_boot_guile_1): Don't init mbstrings module. * hash.c (scm_hasher): Don't handle mbstrings. * gscm.c (gscm_run_scm): Don't init mbstrings module. * gc.c (scm_gc_mark): Don't handle mbstrings. (scm_gc_sweep): Likewise. * eval.c (SCM_CEVAL): Don't handle mbstrings. * eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD. * tags.h (SCM_TYP7SD): Removed. (SCM_TYP7D): Removed. (scm_tc7_mb_string): Removed. (scm_tc7_mb_substring): Removed. * print.c (scm_iprin1): Handle char printing directly. Don't handle mbstrings. Don't include "mbstrings.h". * symbols.c (scm_intern_obarray_soft, scm_string_to_symbol, scm_string_to_obarray_symbol, msymbolize): Don't set symbol's multi-byte flag. Don't include "mbstrings.h". * symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed. (SCM_SYMBOL_SLOTS): Define as 4. (SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD. * arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c, gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c, print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c, struct.c, threads.c, throw.c, unif.c, variable.c: Use new ("gen"-less) I/O function names. * ports.c (scm_add_to_port_table): Don't set port's representation. * ports.h (scm_port_representation_type): Removed. (scm_string_representation_type): Removed. (struct scm_port_table ): Removed representation field. (SCM_PORT_REPRESENTATION): Removed. (SCM_SET_PORT_REPRESENTATION): Removed. * genio.h: Use new function names. * genio.c: Don't include "extchrs.h". (scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc): Removed. (scm_putc, scm_puts, scm_lfwrite): No longer static. (scm_getc): No longer static; handle line and column changes. (scm_ungetc): Renamed from scm_gen_ungetc. (scm_do_read_line): Renamed from scm_gen_read_line. * libguile.h: Don't include "extchrs.h" or "mbstrings.h" * extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
160 lines
3.9 KiB
C
160 lines
3.9 KiB
C
/* Copyright (C) 1995,1996, 1997 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2, or (at your option)
|
||
* any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this software; see the file COPYING. If not, write to
|
||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
* Boston, MA 02111-1307 USA
|
||
*
|
||
* As a special exception, the Free Software Foundation gives permission
|
||
* for additional uses of the text contained in its release of GUILE.
|
||
*
|
||
* The exception is that, if you link the GUILE library with other files
|
||
* to produce an executable, this does not by itself cause the
|
||
* resulting executable to be covered by the GNU General Public License.
|
||
* Your use of that executable is in no way restricted on account of
|
||
* linking the GUILE library code into it.
|
||
*
|
||
* This exception does not however invalidate any other reasons why
|
||
* the executable file might be covered by the GNU General Public License.
|
||
*
|
||
* This exception applies only to the code released by the
|
||
* Free Software Foundation under the name GUILE. If you copy
|
||
* code from other Free Software Foundation releases into a copy of
|
||
* GUILE, as the General Public License permits, the exception does
|
||
* not apply to the code that you add in this way. To avoid misleading
|
||
* anyone as to the status of such modified files, you must delete
|
||
* this exception notice from them.
|
||
*
|
||
* If you write modifications of your own for GUILE, it is your choice
|
||
* whether to permit this exception to apply to your modifications.
|
||
* If you do not wish that, delete this exception notice. */
|
||
|
||
#include <stdio.h>
|
||
#include "_scm.h"
|
||
#include "chars.h"
|
||
|
||
#include "genio.h"
|
||
|
||
#ifdef HAVE_STRING_H
|
||
#include <string.h>
|
||
#endif
|
||
|
||
|
||
void
|
||
scm_putc (c, port)
|
||
int c;
|
||
SCM port;
|
||
{
|
||
scm_sizet i = SCM_PTOBNUM (port);
|
||
SCM_SYSCALL ((scm_ptobs[i].fputc) (c, SCM_STREAM (port)));
|
||
}
|
||
|
||
void
|
||
scm_puts (s, port)
|
||
char *s;
|
||
SCM port;
|
||
{
|
||
scm_sizet i = SCM_PTOBNUM (port);
|
||
SCM_SYSCALL ((scm_ptobs[i].fputs) (s, SCM_STREAM (port)));
|
||
#ifdef TRANSCRIPT_SUPPORT
|
||
if (scm_trans && (port == def_outp || port == cur_errp))
|
||
SCM_SYSCALL (fputs (s, scm_trans));
|
||
#endif
|
||
}
|
||
|
||
void
|
||
scm_lfwrite (ptr, size, port)
|
||
char *ptr;
|
||
scm_sizet size;
|
||
SCM port;
|
||
{
|
||
scm_sizet i = SCM_PTOBNUM (port);
|
||
SCM_SYSCALL (scm_ptobs[i].fwrite(ptr, size, 1, SCM_STREAM (port)));
|
||
#ifdef TRANSCRIPT_SUPPORT
|
||
if (scm_trans && (port == def_outp || port == cur_errp))
|
||
SCM_SYSCALL (fwrite (ptr, size, 1, scm_trans));
|
||
#endif
|
||
}
|
||
|
||
|
||
|
||
|
||
int
|
||
scm_getc (port)
|
||
SCM port;
|
||
{
|
||
SCM f;
|
||
int c;
|
||
scm_sizet i;
|
||
|
||
/* One char may be stored in the high bits of (car port) orre@nada.kth.se. */
|
||
if (SCM_CRDYP (port))
|
||
{
|
||
c = SCM_CGETUN (port);
|
||
SCM_CLRDY (port); /* Clear ungetted char */
|
||
}
|
||
else
|
||
{
|
||
f = SCM_STREAM (port);
|
||
i = SCM_PTOBNUM (port);
|
||
SCM_SYSCALL (c = (scm_ptobs[i].fgetc) (f));
|
||
}
|
||
|
||
if (c == '\n')
|
||
{
|
||
SCM_INCLINE (port);
|
||
}
|
||
else if (c == '\t')
|
||
{
|
||
SCM_TABCOL (port);
|
||
}
|
||
else
|
||
{
|
||
SCM_INCCOL (port);
|
||
}
|
||
|
||
return c;
|
||
}
|
||
|
||
|
||
void
|
||
scm_ungetc (c, port)
|
||
int c;
|
||
SCM port;
|
||
{
|
||
/* SCM_ASSERT(!SCM_CRDYP(port), port, SCM_ARG2, "too many scm_ungetc");*/
|
||
SCM_CUNGET (c, port);
|
||
if (c == '\n')
|
||
{
|
||
/* What should col be in this case?
|
||
* We'll leave it at -1.
|
||
*/
|
||
SCM_LINUM (port) -= 1;
|
||
}
|
||
else
|
||
SCM_COL(port) -= 1;
|
||
}
|
||
|
||
|
||
char *
|
||
scm_do_read_line (port)
|
||
SCM port;
|
||
{
|
||
char *s;
|
||
scm_sizet i;
|
||
|
||
i = SCM_PTOBNUM (port);
|
||
SCM_SYSCALL (s = (scm_ptobs[i].fgets) (port));
|
||
return s;
|
||
}
|
||
|