summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-11-28 22:52:16 +0100
committerLudovic Courtès <ludo@gnu.org>2009-11-28 22:52:16 +0100
commit8b22ed7abdc72f7a8f1844af89aa790d27857c7b (patch)
tree6a45c01126a6e1d067e36455647520ec44c0b85d
parent5c8cefe591d465af8d8eee9ca6edb98143107a73 (diff)
downloadguile-8b22ed7abdc72f7a8f1844af89aa790d27857c7b.tar.gz
Remove remaining uses of discouraged constructs, really.
* libguile/throw.c, libguile/vm-engine.h, libguile/vm-i-system.c, libguile/vm.c: Replace uses of discouraged constructs by their current counterparts.
-rw-r--r--libguile/throw.c4
-rw-r--r--libguile/vm-engine.h2
-rw-r--r--libguile/vm-i-system.c6
-rw-r--r--libguile/vm.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/libguile/throw.c b/libguile/throw.c
index 2217c95ea..14153cf91 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -211,7 +211,7 @@ scm_c_catch (SCM tag,
throw_tag = jbr.throw_tag;
jbr.throw_tag = SCM_EOL;
jbr.retval = SCM_EOL;
- if (SCM_NFALSEP (vm))
+ if (scm_is_true (vm))
{
SCM_VM_DATA (vm)->sp = sp;
SCM_VM_DATA (vm)->fp = fp;
@@ -222,7 +222,7 @@ scm_c_catch (SCM tag,
- (sp + 1 - SCM_VM_DATA (vm)->stack_base)) * sizeof(SCM));
#endif
}
- else if (SCM_NFALSEP ((vm = scm_the_vm ())))
+ else if (scm_is_true ((vm = scm_the_vm ())))
{
/* oof, it's possible this catch was called before the vm was
booted... yick. anyway, try to reset the vm stack. */
diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h
index d69328944..ebe40b2d1 100644
--- a/libguile/vm-engine.h
+++ b/libguile/vm-engine.h
@@ -208,7 +208,7 @@
#if VM_USE_HOOKS
#define RUN_HOOK(h) \
{ \
- if (SCM_UNLIKELY (!SCM_FALSEP (vp->hooks[h])))\
+ if (SCM_UNLIKELY (scm_is_true (vp->hooks[h])))\
{ \
SYNC_REGISTER (); \
vm_dispatch_hook (vp, vp->hooks[h], hook_args); \
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 1f376ab70..c7704f351 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -769,7 +769,7 @@ VM_DEFINE_INSTRUCTION (53, call, "call", 1, -1, 1)
/*
* Other interpreted or compiled call
*/
- if (!SCM_FALSEP (scm_procedure_p (x)))
+ if (!scm_is_false (scm_procedure_p (x)))
{
SCM args;
/* At this point, the stack contains the frame, the procedure and each one
@@ -848,7 +848,7 @@ VM_DEFINE_INSTRUCTION (54, goto_args, "goto/args", 1, -1, 1)
/*
* Other interpreted or compiled call
*/
- if (!SCM_FALSEP (scm_procedure_p (x)))
+ if (!scm_is_false (scm_procedure_p (x)))
{
SCM args;
POP_LIST (nargs);
@@ -933,7 +933,7 @@ VM_DEFINE_INSTRUCTION (57, mv_call, "mv-call", 4, -1, 1)
/*
* Other interpreted or compiled call
*/
- if (!SCM_FALSEP (scm_procedure_p (x)))
+ if (!scm_is_false (scm_procedure_p (x)))
{
SCM args;
/* At this point, the stack contains the procedure and each one of its
diff --git a/libguile/vm.c b/libguile/vm.c
index 209408b33..055bbee4a 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -421,7 +421,7 @@ SCM_DEFINE (scm_the_vm, "the-vm", 0, 0, 0,
{
scm_i_thread *t = SCM_I_CURRENT_THREAD;
- if (SCM_UNLIKELY (SCM_FALSEP ((t->vm))))
+ if (SCM_UNLIKELY (scm_is_false ((t->vm))))
t->vm = make_vm ();
return t->vm;
@@ -482,7 +482,7 @@ SCM_DEFINE (scm_vm_fp, "vm:fp", 1, 0, 0,
struct scm_vm *vp; \
SCM_VALIDATE_VM (1, vm); \
vp = SCM_VM_DATA (vm); \
- if (SCM_FALSEP (vp->hooks[n])) \
+ if (scm_is_false (vp->hooks[n])) \
vp->hooks[n] = scm_make_hook (SCM_I_MAKINUM (1)); \
return vp->hooks[n]; \
}