diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-28 15:11:31 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-28 15:11:31 +0100 |
commit | 5c8cefe591d465af8d8eee9ca6edb98143107a73 (patch) | |
tree | e29bf20aa3ed79f64325ef39197468152f062318 /libguile/vm-i-scheme.c | |
parent | 49bb5bd30714af627ae78b0897ab05ba566e7c00 (diff) | |
download | guile-5c8cefe591d465af8d8eee9ca6edb98143107a73.tar.gz |
Remove remaining uses of discouraged constructs.
* libguile/frames.c, libguile/instructions.c, libguile/objcodes.c,
libguile/programs.c, libguile/throw.c, libguile/vm-i-scheme.c,
libguile/vm.c: Replace uses of discouraged constructs by their
current counterparts.
Diffstat (limited to 'libguile/vm-i-scheme.c')
-rw-r--r-- | libguile/vm-i-scheme.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c index 52f5b113f..c9b40ee56 100644 --- a/libguile/vm-i-scheme.c +++ b/libguile/vm-i-scheme.c @@ -44,13 +44,13 @@ VM_DEFINE_FUNCTION (101, not_not, "not-not", 1) VM_DEFINE_FUNCTION (102, eq, "eq?", 2) { ARGS2 (x, y); - RETURN (scm_from_bool (SCM_EQ_P (x, y))); + RETURN (scm_from_bool (scm_is_eq (x, y))); } VM_DEFINE_FUNCTION (103, not_eq, "not-eq?", 2) { ARGS2 (x, y); - RETURN (scm_from_bool (!SCM_EQ_P (x, y))); + RETURN (scm_from_bool (!scm_is_eq (x, y))); } VM_DEFINE_FUNCTION (104, nullp, "null?", 1) @@ -68,7 +68,7 @@ VM_DEFINE_FUNCTION (105, not_nullp, "not-null?", 1) VM_DEFINE_FUNCTION (106, eqv, "eqv?", 2) { ARGS2 (x, y); - if (SCM_EQ_P (x, y)) + if (scm_is_eq (x, y)) RETURN (SCM_BOOL_T); if (SCM_IMP (x) || SCM_IMP (y)) RETURN (SCM_BOOL_F); @@ -79,7 +79,7 @@ VM_DEFINE_FUNCTION (106, eqv, "eqv?", 2) VM_DEFINE_FUNCTION (107, equal, "equal?", 2) { ARGS2 (x, y); - if (SCM_EQ_P (x, y)) + if (scm_is_eq (x, y)) RETURN (SCM_BOOL_T); if (SCM_IMP (x) || SCM_IMP (y)) RETURN (SCM_BOOL_F); @@ -90,7 +90,7 @@ VM_DEFINE_FUNCTION (107, equal, "equal?", 2) VM_DEFINE_FUNCTION (108, pairp, "pair?", 1) { ARGS1 (x); - RETURN (scm_from_bool (SCM_CONSP (x))); + RETURN (scm_from_bool (scm_is_pair (x))); } VM_DEFINE_FUNCTION (109, listp, "list?", 1) |