Changeset f7428b1 in buchla-68k for include/ctype.h

Timestamp:

07/10/2017 01:26:59 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

5fa506d

Parents:

c3aee8a

Message:

Started to rework include files.

File:

• include/ctype.h (modified) (4 diffs)

include/ctype.h

@@ -10 +10 @@
         the equivalent Lattice C macros.  This means that isascii(c) should
         be used if it is necessary to restrict the results to true ASCII.
-
-        If SYS5CODE is TRUE these macros will use the same table definitions
-        as System 5 Unix(tm).  In this case these behave well even when fed
-        an EOF.  The EOF character value, -1, is not defined as being in any
-        of the classes tested for.  If SYS5CODE is FALSE, the Alcyon table
-        will be used, and EOF will not work properly.
-
-        Define _CTYPE_C for compiling the ctype.c file, undefine otherwise.
-
-        The symbol _ii_ is defined to be the base of the table used.
 
                 isascii(c)  non-zero if c is ASCII
@@ -46 +36 @@
                 _tolower(c) returns the lower case version of c
                 _toupper(c) returns the upper case version of c
-
-                tonumber(c) converts c from ASCII to integer
    ============================================================================
 */
@@ -55 +43 @@
 */
 
-#define SYS5CODE        0       /* define non-zero for System 5 / Aztec C */
-
-#if     SYS5CODE
-
-#define _ii_    _ctype+1
-
-/* System 5 Unix(tm) / Aztec C table definitions */
-
-#define _U      0x01    /* upper case */
-#define _L      0x02    /* lower case */
-#define _N      0x04    /* numeric 0..9 */
-#define _S      0x08    /* whitespace */
-#define _P      0x10    /* punctuation */
-#define _C      0x20    /* control 00..1F */
-#define _B      0x40    /* blank */
-#define _X      0x80    /* hex digit */
-
-#else
-
-#define _ii_    __atab
+#pragma once
 
 /* Digital Research / Alcyon C table definitions */
@@ -87 +56 @@
 #define _X      0x80    /* hex digit */
 
-#endif
-
-#ifndef _CTYPE_C
-
-#if     SYS5CODE
-
-extern  char _ctype[];          /* character type table */
-
-#else   /* SYS5CODE */
-
-extern  void    ___atab(void);
-extern  int8_t __atab[];                /* character type table */
-
-#endif  /* SYS5CODE */
-
-extern  int16_t tolower(int16_t c);
-extern  int16_t toupper(int16_t c);
-
-#endif  /* _CTYPE_C */
-
 /* 
 
 */
 
-#define isascii(c)      (!((c)&~0x7F))
+#define isascii(c)      (!((c) & ~0x7f))
 
-#define isprint(c)      ((_ii_)[c]&(_P|_U|_L|_N|_B))
-#define isgraph(c)      ((_ii_)[c]&(_P|_U|_L|_N))
-#define iscntrl(c)      ((_ii_)[c]&_C)
+#define isprint(c)      (__atab[(c) & 0xff] & (_P | _U | _L | _N | _B))
+#define isgraph(c)      (__atab[(c) & 0xff] & (_P | _U | _L | _N))
+#define iscntrl(c)      (__atab[(c) & 0xff] & _C)
 
-#define isalpha(c)      ((_ii_)[c]&(_U|_L))
-#define isupper(c)      ((_ii_)[c]&_U)
-#define islower(c)      ((_ii_)[c]&_L)
+#define isalpha(c)      (__atab[(c) & 0xff] & (_U | _L))
+#define isupper(c)      (__atab[(c) & 0xff] & _U)
+#define islower(c)      (__atab[(c) & 0xff] & _L)
 
-#define isdigit(c)      ((_ii_)[c]&_N)
-#define isxdigit(c)     ((_ii_)[c]&_X)
+#define isdigit(c)      (__atab[(c) & 0xff] & _N)
+#define isxdigit(c)     (__atab[(c) & 0xff] & _X)
 
-#define isalnum(c)      ((_ii_)[c]&(_U|_L|_N))
+#define isalnum(c)      (__atab[(c) & 0xff] & (_U | _L | _N))
 
-#define isspace(c)      ((_ii_)[c]&_S)
-#define ispunct(c)      ((_ii_)[c]&_P)
+#define isspace(c)      (__atab[(c) & 0xff] & _S)
+#define ispunct(c)      (__atab[(c) & 0xff] & _P)
 
-#define iscsym(c)       (isalnum(c)||(((c)&127)==0x5F))
-#define iscsymf(c)      (isalpha(c)||(((c)&127)==0x5F))
+#define iscsym(c)       (isalnum(c) || (((c) & 0x7f) == 0x5f))
+#define iscsymf(c)      (isalpha(c) || (((c) & 0x7f) == 0x5f))
 
-#define toascii(c)      ((c)&0x7F)
+#define toascii(c)      ((c) & 0x7f)
 
-#define _toupper(c)     ((c)-'a'+'A')
-#define _tolower(c)     ((c)-'A'+'a')
-
-#define tonumber(c)     ((((c)&0x7F)>'9')?((islower(c)?_toupper(c):c)-'A'+10):(c&0x0F))
-
+#define _toupper(c)     ((c) - 'a' + 'A')
+#define _tolower(c)     ((c) - 'A' + 'a')