Commit 7e9d10c3 authored by Kim F. Storm's avatar Kim F. Storm
Browse files

(CHECK_CATEGORY, CHECK_CATEGORY_SET): Use CHECK_TYPE.

parent 915a3e00
...@@ -54,10 +54,8 @@ Boston, MA 02110-1301, USA. */ ...@@ -54,10 +54,8 @@ Boston, MA 02110-1301, USA. */
#define CATEGORYP(x) \ #define CATEGORYP(x) \
(INTEGERP ((x)) && XFASTINT ((x)) >= 0x20 && XFASTINT ((x)) <= 0x7E) (INTEGERP ((x)) && XFASTINT ((x)) >= 0x20 && XFASTINT ((x)) <= 0x7E)
#define CHECK_CATEGORY(x) \ #define CHECK_CATEGORY(x) \
do { \ CHECK_TYPE (CATEGORYP (x), Qcategoryp, x)
if (!CATEGORYP ((x))) x = wrong_type_argument (Qcategoryp, (x)); \
} while (0)
#define XCATEGORY_SET XBOOL_VECTOR #define XCATEGORY_SET XBOOL_VECTOR
...@@ -72,10 +70,8 @@ Boston, MA 02110-1301, USA. */ ...@@ -72,10 +70,8 @@ Boston, MA 02110-1301, USA. */
#define SET_CATEGORY_SET(category_set, category, val) \ #define SET_CATEGORY_SET(category_set, category, val) \
(Faset (category_set, category, val)) (Faset (category_set, category, val))
#define CHECK_CATEGORY_SET(x) \ #define CHECK_CATEGORY_SET(x) \
do { \ CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
if (!CATEGORY_SET_P ((x))) x = wrong_type_argument (Qcategorysetp, (x)); \
} while (0)
/* Return 1 if CATEGORY_SET contains CATEGORY, else return 0. /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
The faster version of `!NILP (Faref (category_set, category))'. */ The faster version of `!NILP (Faref (category_set, category))'. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment