mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Replaced all uses of deprecated SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,

Browse source 
SCM_NEGATE_BOOL, and SCM_BOOLP with scm_is_false, scm_is_true,
scm_from_bool, and scm_is_bool, respectively.  Thanks to Andreas
Vögele!
This commit is contained in:
Marius Vollmer 2004-07-10 15:25:01 +00:00
parent 0523f1c0d8
commit be49d1df07
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
guile-readline/readline.c
View file

@ -136,7 +136,7 @@ static SCM before_read;
static int static int
current_input_getc (FILE *in SCM_UNUSED) current_input_getc (FILE *in SCM_UNUSED)
{ {
if (promptp && !SCM_FALSEP (before_read)) if (promptp && scm_is_true (before_read))
{ {
scm_apply (before_read, SCM_EOL, SCM_EOL); scm_apply (before_read, SCM_EOL, SCM_EOL);
promptp = 0; promptp = 0;
@ -190,9 +190,9 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
SCM_EOL); SCM_EOL);
} }
if (!(SCM_UNBNDP (read_hook) || SCM_FALSEP (read_hook))) if (!(SCM_UNBNDP (read_hook) || scm_is_false (read_hook)))
{ {
if (!(SCM_NFALSEP (scm_thunk_p (read_hook)))) if (scm_is_false (scm_thunk_p (read_hook)))
{ {
--in_readline; --in_readline;
scm_wrong_type_arg (s_scm_readline, SCM_ARG4, read_hook); scm_wrong_type_arg (s_scm_readline, SCM_ARG4, read_hook);
@ -377,9 +377,9 @@ SCM_DEFINE (scm_filename_completion_function, "filename-completion-function", 2,
SCM ans; SCM ans;
SCM_VALIDATE_STRING (1,text); SCM_VALIDATE_STRING (1,text);
#ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION #ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
s = rl_filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP (continuep)); s = rl_filename_completion_function (SCM_STRING_CHARS (text), scm_is_true (continuep));
#else #else
s = filename_completion_function (SCM_STRING_CHARS (text), SCM_NFALSEP (continuep)); s = filename_completion_function (SCM_STRING_CHARS (text), scm_is_true (continuep));
#endif #endif
ans = scm_makfrom0str (s); ans = scm_makfrom0str (s);
free (s); free (s);
@ -400,15 +400,15 @@ completion_function (char *text, int continuep)
SCM compfunc = SCM_VARIABLE_REF (scm_readline_completion_function_var); SCM compfunc = SCM_VARIABLE_REF (scm_readline_completion_function_var);
SCM res; SCM res;
if (SCM_FALSEP (compfunc)) if (scm_is_false (compfunc))
return NULL; /* #f => completion disabled */ return NULL; /* #f => completion disabled */
else else
{ {
SCM t = scm_makfrom0str (text); SCM t = scm_makfrom0str (text);
SCM c = continuep ? SCM_BOOL_T : SCM_BOOL_F; SCM c = scm_from_bool (continuep);
res = scm_apply (compfunc, scm_list_2 (t, c), SCM_EOL); res = scm_apply (compfunc, scm_list_2 (t, c), SCM_EOL);
if (SCM_FALSEP (res)) if (scm_is_false (res))
return NULL; return NULL;
if (!SCM_STRINGP (res)) if (!SCM_STRINGP (res))