mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

Change the name of the objects returned by OPENDIR from

Browse source 
"directory" to "directory stream".  A predicate named "directory?"
would be confusing.
* filesys.c (scm_directory_stream_p): Renamed from scm_directory_p.
At the Scheme level, "directory?" -> "directory-stream?".
(scm_dir_print): Use the phrase "directory stream" in printed form.
* filesys.h (scm_directory_stream_p): Prototype renamed
accordingly.
This commit is contained in:
Jim Blandy 1999-09-12 03:47:39 +00:00
parent 645813f588
commit 0d03da62e3
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/filesys.c
View file

@ -581,9 +581,9 @@ scm_rmdir (path)
long scm_tc16_dir; long scm_tc16_dir;
SCM_PROC (s_directory_p, "directory?", 1, 0, 0, scm_directory_p); SCM_PROC (s_directory_stream_p, "directory-stream?", 1, 0, 0, scm_directory_stream_p);
SCM SCM
scm_directory_p (SCM obj) scm_directory_stream_p (SCM obj)
{ {
return SCM_NIMP (obj) && SCM_DIRP (obj) ? SCM_BOOL_T : SCM_BOOL_F; return SCM_NIMP (obj) && SCM_DIRP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
} }
@ -667,7 +667,7 @@ scm_dir_print (SCM exp, SCM port, scm_print_state *pstate)
scm_puts ("#<", port); scm_puts ("#<", port);
if (SCM_CLOSEDP (exp)) if (SCM_CLOSEDP (exp))
scm_puts ("closed: ", port); scm_puts ("closed: ", port);
scm_puts ("directory ", port); scm_puts ("directory stream ", port);
scm_intprint (SCM_CDR (exp), 16, port); scm_intprint (SCM_CDR (exp), 16, port);
scm_putc ('>', port); scm_putc ('>', port);
return 1; return 1;

4
libguile/filesys.h
View file

@ -2,7 +2,7 @@
#ifndef FILESYSH #ifndef FILESYSH
#define FILESYSH #define FILESYSH
/* Copyright (C) 1995,1997,1998 Free Software Foundation, Inc. /* Copyright (C) 1995,1997,1998, 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
@ -66,7 +66,7 @@ extern SCM scm_rename SCM_P ((SCM oldname, SCM newname));
extern SCM scm_delete_file SCM_P ((SCM str)); extern SCM scm_delete_file SCM_P ((SCM str));
extern SCM scm_mkdir SCM_P ((SCM path, SCM mode)); extern SCM scm_mkdir SCM_P ((SCM path, SCM mode));
extern SCM scm_rmdir SCM_P ((SCM path)); extern SCM scm_rmdir SCM_P ((SCM path));
extern SCM scm_directory_p (SCM obj); extern SCM scm_directory_stream_p (SCM obj);
extern SCM scm_opendir SCM_P ((SCM dirname)); extern SCM scm_opendir SCM_P ((SCM dirname));
extern SCM scm_readdir SCM_P ((SCM port)); extern SCM scm_readdir SCM_P ((SCM port));
extern SCM scm_rewinddir SCM_P ((SCM port)); extern SCM scm_rewinddir SCM_P ((SCM port));