diff options
| author | Marius Vollmer <mvo@zagadka.de> | 2004-09-22 17:41:37 +0000 |
|---|---|---|
| committer | Marius Vollmer <mvo@zagadka.de> | 2004-09-22 17:41:37 +0000 |
| commit | d2e53ed6f84df8c79f4bf5cf41d4f6d381bc065b (patch) | |
| tree | df14a633c6d8ac08ba098651a9164a0c991d8288 /libguile/evalext.c | |
| parent | a61f4e0c61695e17984b25b16fbf720b851b739c (diff) | |
| download | guile-d2e53ed6f84df8c79f4bf5cf41d4f6d381bc065b.tar.gz | |
*** empty log message ***
Diffstat (limited to 'libguile/evalext.c')
| -rw-r--r-- | libguile/evalext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/evalext.c b/libguile/evalext.c index a18d965b6..6a2a1b14b 100644 --- a/libguile/evalext.c +++ b/libguile/evalext.c @@ -47,14 +47,14 @@ SCM_DEFINE (scm_defined_p, "defined?", 1, 1, 0, register SCM b; for (; SCM_NIMP (frames); frames = SCM_CDR (frames)) { - SCM_ASSERT (SCM_CONSP (frames), env, SCM_ARG2, FUNC_NAME); + SCM_ASSERT (scm_is_pair (frames), env, SCM_ARG2, FUNC_NAME); b = SCM_CAR (frames); if (scm_is_true (scm_procedure_p (b))) break; - SCM_ASSERT (SCM_CONSP (b), env, SCM_ARG2, FUNC_NAME); + SCM_ASSERT (scm_is_pair (b), env, SCM_ARG2, FUNC_NAME); for (b = SCM_CAR (b); SCM_NIMP (b); b = SCM_CDR (b)) { - if (!SCM_CONSP (b)) + if (!scm_is_pair (b)) { if (scm_is_eq (b, sym)) return SCM_BOOL_T; @@ -93,7 +93,7 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0, return SCM_BOOL_T; case scm_tc3_imm24: /* characters, booleans, other immediates */ - return scm_from_bool (!SCM_NULLP (obj)); + return scm_from_bool (!scm_is_null (obj)); case scm_tc3_cons: switch (SCM_TYP7 (obj)) { |