diff options
author | Tom Tromey <tromey@redhat.com> | 1997-10-15 17:18:32 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 1997-10-15 17:18:32 +0000 |
commit | b7f3516f99450ec2f0338ed1d17e28491c85de9e (patch) | |
tree | d0bfca606a3a187d20da8671282641c04e74aa61 /libguile/ports.c | |
parent | 8d6787b6dcf1480f3c67c4c9b8d4ca81b4ec0b40 (diff) | |
download | guile-b7f3516f99450ec2f0338ed1d17e28491c85de9e.tar.gz |
* Makefile.in: Rebuilt.
* 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.
Diffstat (limited to 'libguile/ports.c')
-rw-r--r-- | libguile/ports.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libguile/ports.c b/libguile/ports.c index d1f3cc67b..5a801148f 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -258,7 +258,6 @@ scm_add_to_port_table (port) scm_port_table[scm_port_table_size]->file_name = SCM_BOOL_F; scm_port_table[scm_port_table_size]->line_number = 1; scm_port_table[scm_port_table_size]->column_number = 0; - scm_port_table[scm_port_table_size]->representation = scm_regular_port; return scm_port_table[scm_port_table_size++]; } @@ -543,7 +542,7 @@ scm_read_char (port) port = scm_cur_inp; else SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port, SCM_ARG1, s_read_char); - c = scm_gen_getc (port); + c = scm_getc (port); if (EOF == c) return SCM_EOF_VAL; return SCM_MAKICHR (c); @@ -561,10 +560,10 @@ scm_peek_char (port) port = scm_cur_inp; else SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port, SCM_ARG1, s_peek_char); - c = scm_gen_getc (port); + c = scm_getc (port); if (EOF == c) return SCM_EOF_VAL; - scm_gen_ungetc (c, port); + scm_ungetc (c, port); return SCM_MAKICHR (c); } @@ -642,7 +641,7 @@ scm_unread_char (cobj, port) c = SCM_ICHR (cobj); - scm_gen_ungetc (c, port); + scm_ungetc (c, port); return cobj; } @@ -765,25 +764,25 @@ scm_prinport (exp, port, type) SCM port; char *type; { - scm_gen_puts (scm_regular_string, "#<", port); + scm_puts ("#<", port); if (SCM_CLOSEDP (exp)) - scm_gen_puts (scm_regular_string, "closed: ", port); + scm_puts ("closed: ", port); else { if (SCM_RDNG & SCM_CAR (exp)) - scm_gen_puts (scm_regular_string, "input: ", port); + scm_puts ("input: ", port); if (SCM_WRTNG & SCM_CAR (exp)) - scm_gen_puts (scm_regular_string, "output: ", port); + scm_puts ("output: ", port); } - scm_gen_puts (scm_regular_string, type, port); - scm_gen_putc (' ', port); + scm_puts (type, port); + scm_putc (' ', port); #ifndef MSDOS #ifndef __EMX__ #ifndef _DCC #ifndef AMIGA #ifndef THINK_C if (SCM_OPENP (exp) && scm_tc16_fport == SCM_TYP16 (exp) && isatty (fileno ((FILE *)SCM_STREAM (exp)))) - scm_gen_puts (scm_regular_string, ttyname (fileno ((FILE *)SCM_STREAM (exp))), port); + scm_puts (ttyname (fileno ((FILE *)SCM_STREAM (exp))), port); else #endif #endif @@ -794,7 +793,7 @@ scm_prinport (exp, port, type) scm_intprint ((long) fileno ((FILE *)SCM_STREAM (exp)), 10, port); else scm_intprint (SCM_CDR (exp), 16, port); - scm_gen_putc ('>', port); + scm_putc ('>', port); } |