From fc45b7e8e826d2e870f6e316749f87c20d083cb1 Mon Sep 17 00:00:00 2001 From: BT Templeton Date: Wed, 7 Mar 2012 14:34:13 -0500 Subject: [PATCH] integerp, wholenump return nil for non-numbers * module/language/elisp/boot.el (integerp, wholenump): Call `integer?' before `exact?' so that these predicates return nil for non-numbers instead of signalling an error. --- module/language/elisp/boot.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el index bec32b545..1ea86397f 100644 --- a/module/language/elisp/boot.el +++ b/module/language/elisp/boot.el @@ -237,16 +237,14 @@ (null (funcall (@ (guile) integer?) object))))) (defun integerp (object) - (and (funcall (@ (guile) exact?) object) - (funcall (@ (guile) integer?) object))) + (and (funcall (@ (guile) integer?) object) + (funcall (@ (guile) exact?) object))) (defun numberp (object) (funcall (@ (guile) real?) object)) (defun wholenump (object) - (and (funcall (@ (guile) exact?) object) - (funcall (@ (guile) integer?) object) - (>= object 0))) + (and (integerp object) (>= object 0))) (defun zerop (object) (= object 0))