diff options
Diffstat (limited to 'Src/ztype.h')
-rw-r--r-- | Src/ztype.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Src/ztype.h b/Src/ztype.h index b8bc584db..7b7973602 100644 --- a/Src/ztype.h +++ b/Src/ztype.h @@ -42,22 +42,22 @@ #define IMETA (1 << 12) #define IWSEP (1 << 13) #define INULL (1 << 14) -#define _icom(X,Y) (typtab[STOUC(X)] & Y) -#define idigit(X) _icom(X,IDIGIT) -#define ialnum(X) _icom(X,IALNUM) -#define iblank(X) _icom(X,IBLANK) /* blank, not including \n */ -#define inblank(X) _icom(X,INBLANK) /* blank or \n */ -#define itok(X) _icom(X,ITOK) -#define isep(X) _icom(X,ISEP) -#define ialpha(X) _icom(X,IALPHA) -#define iident(X) _icom(X,IIDENT) -#define iuser(X) _icom(X,IUSER) /* username char */ -#define icntrl(X) _icom(X,ICNTRL) -#define iword(X) _icom(X,IWORD) -#define ispecial(X) _icom(X,ISPECIAL) -#define imeta(X) _icom(X,IMETA) -#define iwsep(X) _icom(X,IWSEP) -#define inull(X) _icom(X,INULL) +#define zistype(X,Y) (typtab[STOUC(X)] & Y) +#define idigit(X) zistype(X,IDIGIT) +#define ialnum(X) zistype(X,IALNUM) +#define iblank(X) zistype(X,IBLANK) /* blank, not including \n */ +#define inblank(X) zistype(X,INBLANK) /* blank or \n */ +#define itok(X) zistype(X,ITOK) +#define isep(X) zistype(X,ISEP) +#define ialpha(X) zistype(X,IALPHA) +#define iident(X) zistype(X,IIDENT) +#define iuser(X) zistype(X,IUSER) /* username char */ +#define icntrl(X) zistype(X,ICNTRL) +#define iword(X) zistype(X,IWORD) +#define ispecial(X) zistype(X,ISPECIAL) +#define imeta(X) zistype(X,IMETA) +#define iwsep(X) zistype(X,IWSEP) +#define inull(X) zistype(X,INULL) #define iascii(X) isascii(STOUC(X)) #define ilower(X) islower(STOUC(X)) |