- if ((CC_EQ(s,i, "alnum") && isalnum(ch))
- || (CC_EQ(s,i, "alpha") && isalpha(ch))
- || (CC_EQ(s,i, "blank") && isblank(ch))
- || (CC_EQ(s,i, "cntrl") && iscntrl(ch))
- || (CC_EQ(s,i, "digit") && isdigit(ch))
- || (CC_EQ(s,i, "graph") && isgraph(ch))
- || (CC_EQ(s,i, "lower") && islower(ch))
- || (CC_EQ(s,i, "print") && isprint(ch))
- || (CC_EQ(s,i, "punct") && ispunct(ch))
- || (CC_EQ(s,i, "space") && isspace(ch))
- || (CC_EQ(s,i, "upper") && isupper(ch))
- || (CC_EQ(s,i,"xdigit") && isxdigit(ch)))
+ if ((CC_EQ(s,i, "alnum") && ISALNUM(ch))
+ || (CC_EQ(s,i, "alpha") && ISALPHA(ch))
+ || (CC_EQ(s,i, "blank") && ISBLANK(ch))
+ || (CC_EQ(s,i, "cntrl") && ISCNTRL(ch))
+ || (CC_EQ(s,i, "digit") && ISDIGIT(ch))
+ || (CC_EQ(s,i, "graph") && ISGRAPH(ch))
+ || (CC_EQ(s,i, "lower") && ISLOWER(ch))
+ || (CC_EQ(s,i, "print") && ISPRINT(ch))
+ || (CC_EQ(s,i, "punct") && ISPUNCT(ch))
+ || (CC_EQ(s,i, "space") && ISSPACE(ch))
+ || (CC_EQ(s,i, "upper") && ISUPPER(ch))
+ || (CC_EQ(s,i,"xdigit") && ISXDIGIT(ch)))