use numberp(p) for numberp symbol, instead of isnum

Author: k-okada

lisp/c/eus.h

@@ -737,6 +737,7 @@ extern int export_all;
 #define isint(p) (!((eusinteger_t)(p) & 3))
 #define isflt(p) (((eusinteger_t)(p) & 3)==1)
 #define isnum(p) (((eusinteger_t)(p) & 2)==0)
+#define numberp(p) (((isnum(p)) || (pisextnum(p)))) // predicates.c:NUMBERP
 #define ispointer(p) ((eusinteger_t)(p) & 2)
 #define makeint(v) ((pointer)(((eusinteger_t)v)<<2))
 #define bpointerof(p) ((bpointer)((eusinteger_t)(p)-2))
@@ -749,6 +750,7 @@ extern int export_all;
 #define	isint(p)	( (((eusinteger_t)(p)&3)==2) || (((eusinteger_t)(p)&0x3)==0x3) )
 #define isflt(p) (((eusinteger_t)(p) & 3)==1)
 #define isnum(p) (((eusinteger_t)(p) & 3))
+#define numberp(p) (((isnum(p)) || (pisextnum(p)))) // predicates.c:NUMBERP
 #define ispointer(p) (!((eusinteger_t)(p) & 3))
 // #define makeint(v) ((pointer)((((eusinteger_t)(v))<<2)+2)) // org
 #ifdef __cplusplus

lisp/comp/trans.l

@@ -438,7 +438,7 @@
     (send self :push
 	  (format nil "(~A(w)?T:NIL)"
 	       (cdr (assoc pred '((symbolp . "issymbol") (consp . "iscons")
-				  (numberp . "isnum") (integerp . "isint")
+				  (numberp . "numberp") (integerp . "isint")
 				  (floatp . "isflt") (stringp . "isstring")
 				 ))))))
  (:if-nil (lab)
@@ -511,7 +511,7 @@
 ;;; type check
  (:type-checker (tn)
     (cdr (assq tn '((symbolp . "issymbol") (integerp . "isint")
-		    (numberp . "isnum")
+		    (numberp . "numberp")
 		    (floatp . "isflt") (atom . "!iscons")
 		    (consp . "iscons") (stringp . "isstring")))))
  (:if-type (type lab)