[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core/guile-readline ChangeLog readl...
From: |
Dirk Herrmann |
Subject: |
guile/guile-core/guile-readline ChangeLog readl... |
Date: |
Fri, 24 Nov 2000 02:38:57 -0800 |
CVSROOT: /cvs
Module name: guile
Changes by: Dirk Herrmann <address@hidden> 00/11/24 02:38:57
Modified files:
guile-core/guile-readline: ChangeLog readline.c
Log message:
* Fixed readline default input/output port parameter handling.
* Removed redundant SCM_N?IMP tests.
CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/ChangeLog.diff?r1=1.44&r2=1.45
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/guile-readline/readline.c.diff?r1=1.28&r2=1.29
Patches:
Index: guile/guile-core/guile-readline/ChangeLog
diff -u guile/guile-core/guile-readline/ChangeLog:1.44
guile/guile-core/guile-readline/ChangeLog:1.45
--- guile/guile-core/guile-readline/ChangeLog:1.44 Fri Nov 24 02:24:04 2000
+++ guile/guile-core/guile-readline/ChangeLog Fri Nov 24 02:38:57 2000
@@ -1,5 +1,16 @@
2000-11-24 Dirk Herrmann <address@hidden>
+ * readline.c (current_input_getc): Use more explicit predicate
+ than SCM_NIMP.
+
+ (scm_readline, scm_readline_init_ports, completion_function):
+ Remove redundant SCM_N?IMP tests.
+
+ (scm_readline): Fixed default input/output port parameter
+ handling.
+
+2000-11-24 Dirk Herrmann <address@hidden>
+
* readline.c (scm_readline, scm_add_history, completion_function,
scm_filename_completion_function): Replace calls to
SCM_COERCE_SUBSTR with SCM_STRING_COERCE_0TERMINATION_X.
Index: guile/guile-core/guile-readline/readline.c
diff -u guile/guile-core/guile-readline/readline.c:1.28
guile/guile-core/guile-readline/readline.c:1.29
--- guile/guile-core/guile-readline/readline.c:1.28 Fri Nov 24 02:24:04 2000
+++ guile/guile-core/guile-readline/readline.c Fri Nov 24 02:38:57 2000
@@ -129,7 +129,7 @@
static int
current_input_getc (FILE *in)
{
- if (promptp && SCM_NIMP (before_read))
+ if (promptp && !SCM_FALSEP (before_read))
{
scm_apply (before_read, SCM_EOL, SCM_EOL);
promptp = 0;
@@ -167,7 +167,7 @@
if (!SCM_UNBNDP (text))
{
- if (!(SCM_NIMP (text) && SCM_STRINGP (text)))
+ if (!SCM_STRINGP (text))
{
--in_readline;
scm_wrong_type_arg (s_scm_readline, SCM_ARG1, text);
@@ -175,8 +175,8 @@
SCM_STRING_COERCE_0TERMINATION_X (text);
}
- if (!((SCM_UNBNDP (inp) && SCM_NIMP (scm_cur_inp) && SCM_OPINFPORTP (inp))
- || (SCM_NIMP (inp) && SCM_OPINFPORTP (inp))))
+ if (!((SCM_UNBNDP (inp) && SCM_OPINFPORTP (scm_cur_inp))
+ || SCM_OPINFPORTP (inp)))
{
--in_readline;
scm_misc_error (s_scm_readline,
@@ -184,8 +184,8 @@
SCM_EOL);
}
- if (!((SCM_UNBNDP (outp) && SCM_NIMP (scm_cur_outp) && SCM_OPINFPORTP (outp))
- || (SCM_NIMP (outp) && SCM_OPOUTFPORTP (outp))))
+ if (!((SCM_UNBNDP (outp) && SCM_OPINFPORTP (scm_cur_outp))
+ || SCM_OPOUTFPORTP (outp)))
{
--in_readline;
scm_misc_error (s_scm_readline,
@@ -302,13 +302,13 @@
if (SCM_UNBNDP (outp))
outp = scm_cur_outp;
- if (!(SCM_NIMP (inp) && SCM_OPINFPORTP (inp))) {
+ if (!SCM_OPINFPORTP (inp)) {
scm_misc_error (0,
"Input port is not open or not a file port",
SCM_EOL);
}
- if (!(SCM_NIMP (outp) && SCM_OPOUTFPORTP (outp))) {
+ if (!SCM_OPOUTFPORTP (outp)) {
scm_misc_error (0,
"Output port is not open or not a file port",
SCM_EOL);
@@ -400,7 +400,7 @@
if (SCM_FALSEP (res))
return NULL;
- if (!(SCM_NIMP (res) && SCM_STRINGP (res)))
+ if (!SCM_STRINGP (res))
scm_misc_error (s_scm_readline,
"Completion function returned bogus value: %S",
SCM_LIST1 (res));