mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

* read.c (scm_read): Don't assume that scm_cur_inp is always open.

Browse source 
* ports.c (scm_read_char): Same.
* ioext.c (scm_read_line): Same.
(Thanks to Bernard Urban.)
This commit is contained in:
Jim Blandy 1999-09-20 23:34:57 +00:00
parent 920ffdaa76
commit 4cc81ec6ca
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/ioext.c
View file

@ -245,11 +245,8 @@ scm_read_line (port)
if (SCM_UNBNDP (port)) if (SCM_UNBNDP (port))
port = scm_cur_inp; port = scm_cur_inp;
else SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port),
{ port, SCM_ARG1, s_read_line);
SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port),
port, SCM_ARG1, s_read_line);
}
pt = SCM_PTAB_ENTRY (port); pt = SCM_PTAB_ENTRY (port);
if (pt->rw_active == SCM_PORT_WRITE) if (pt->rw_active == SCM_PORT_WRITE)

3
libguile/ports.c
View file

@ -669,8 +669,7 @@ scm_read_char (SCM port)
int c; int c;
if (SCM_UNBNDP (port)) if (SCM_UNBNDP (port))
port = scm_cur_inp; port = scm_cur_inp;
else SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port, SCM_ARG1, s_read_char);
SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port, SCM_ARG1, s_read_char);
c = scm_getc (port); c = scm_getc (port);
if (EOF == c) if (EOF == c)
return SCM_EOF_VAL; return SCM_EOF_VAL;

11
libguile/read.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1997, 1999 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -98,11 +98,10 @@ scm_read (port)
if (SCM_UNBNDP (port)) if (SCM_UNBNDP (port))
port = scm_cur_inp; port = scm_cur_inp;
else SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port),
SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port,
port, SCM_ARG1,
SCM_ARG1, s_read);
s_read);
c = scm_flush_ws (port, (char *) NULL); c = scm_flush_ws (port, (char *) NULL);
if (EOF == c) if (EOF == c)