safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
/* <ctype.h> replacement macros.
|
|
|
|
|
|
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
|
|
Contributed by Zack Weinberg <zackw@stanford.edu>.
|
|
|
|
|
|
|
|
This file is part of the libiberty library.
|
|
|
|
Libiberty is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
Libiberty is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with libiberty; see the file COPYING.LIB. If
|
|
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
/* This is a compatible replacement of the standard C library's <ctype.h>
|
|
|
|
with the following properties:
|
|
|
|
|
|
|
|
- Implements all isxxx() macros required by C99.
|
|
|
|
- Also implements some character classes useful when
|
|
|
|
parsing C-like languages.
|
|
|
|
- Does not change behavior depending on the current locale.
|
|
|
|
- Behaves properly for all values in the range of a signed or
|
|
|
|
unsigned char. */
|
|
|
|
|
2000-12-13 19:11:45 +01:00
|
|
|
#include "ansidecl.h"
|
safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
#include <safe-ctype.h>
|
|
|
|
#include <stdio.h> /* for EOF */
|
|
|
|
|
|
|
|
/* Shorthand */
|
|
|
|
#define bl _sch_isblank
|
|
|
|
#define cn _sch_iscntrl
|
|
|
|
#define di _sch_isdigit
|
|
|
|
#define is _sch_isidst
|
|
|
|
#define lo _sch_islower
|
|
|
|
#define nv _sch_isnvsp
|
|
|
|
#define pn _sch_ispunct
|
|
|
|
#define pr _sch_isprint
|
|
|
|
#define sp _sch_isspace
|
|
|
|
#define up _sch_isupper
|
|
|
|
#define vs _sch_isvsp
|
|
|
|
#define xd _sch_isxdigit
|
|
|
|
|
|
|
|
/* Masks. */
|
|
|
|
#define L lo|is |pr /* lower case letter */
|
|
|
|
#define XL lo|is|xd|pr /* lowercase hex digit */
|
|
|
|
#define U up|is |pr /* upper case letter */
|
|
|
|
#define XU up|is|xd|pr /* uppercase hex digit */
|
|
|
|
#define D di |xd|pr /* decimal digit */
|
|
|
|
#define P pn |pr /* punctuation */
|
|
|
|
#define _ pn|is |pr /* underscore */
|
|
|
|
|
|
|
|
#define C cn /* control character */
|
|
|
|
#define Z nv |cn /* NUL */
|
|
|
|
#define M nv|sp |cn /* cursor movement: \f \v */
|
|
|
|
#define V vs|sp |cn /* vertical space: \r \n */
|
|
|
|
#define T nv|sp|bl|cn /* tab */
|
|
|
|
#define S nv|sp|bl|pr /* space */
|
|
|
|
|
|
|
|
/* Are we ASCII? */
|
|
|
|
#if '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
|
|
|
|
&& 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21 \
|
|
|
|
&& EOF == -1
|
|
|
|
|
|
|
|
const unsigned short _sch_istable[256] =
|
|
|
|
{
|
|
|
|
Z, C, C, C, C, C, C, C, /* NUL SOH STX ETX EOT ENQ ACK BEL */
|
|
|
|
C, T, V, M, M, V, C, C, /* BS HT LF VT FF CR SO SI */
|
|
|
|
C, C, C, C, C, C, C, C, /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB */
|
|
|
|
C, C, C, C, C, C, C, C, /* CAN EM SUB ESC FS GS RS US */
|
|
|
|
S, P, P, P, P, P, P, P, /* SP ! " # $ % & ' */
|
|
|
|
P, P, P, P, P, P, P, P, /* ( ) * + , - . / */
|
|
|
|
D, D, D, D, D, D, D, D, /* 0 1 2 3 4 5 6 7 */
|
|
|
|
D, D, P, P, P, P, P, P, /* 8 9 : ; < = > ? */
|
|
|
|
P, XU, XU, XU, XU, XU, XU, U, /* @ A B C D E F G */
|
|
|
|
U, U, U, U, U, U, U, U, /* H I J K L M N O */
|
|
|
|
U, U, U, U, U, U, U, U, /* P Q R S T U V W */
|
|
|
|
U, U, U, P, P, P, P, _, /* X Y Z [ \ ] ^ _ */
|
|
|
|
P, XL, XL, XL, XL, XL, XL, L, /* ` a b c d e f g */
|
|
|
|
L, L, L, L, L, L, L, L, /* h i j k l m n o */
|
|
|
|
L, L, L, L, L, L, L, L, /* p q r s t u v w */
|
|
|
|
L, L, L, P, P, P, P, C, /* x y z { | } ~ DEL */
|
|
|
|
|
|
|
|
/* high half of unsigned char is locale-specific, so all tests are
|
|
|
|
false in "C" locale */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
};
|
|
|
|
|
|
|
|
const unsigned char _sch_tolower[256] =
|
|
|
|
{
|
|
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
|
|
|
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
|
|
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
|
|
|
|
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
|
|
|
64,
|
|
|
|
|
|
|
|
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
|
|
|
|
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
|
|
|
|
|
|
|
91, 92, 93, 94, 95, 96,
|
|
|
|
|
|
|
|
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
|
|
|
|
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
|
|
|
|
|
|
|
123,124,125,126,127,
|
|
|
|
|
|
|
|
128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
|
|
|
|
144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
|
|
|
|
160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
|
|
|
|
176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
|
|
|
|
|
|
|
|
192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
|
|
|
|
208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
|
|
|
|
224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
|
|
|
|
240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
|
|
|
|
};
|
|
|
|
|
|
|
|
const unsigned char _sch_toupper[256] =
|
|
|
|
{
|
|
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
|
|
|
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
|
|
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
|
|
|
|
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
|
|
|
64,
|
|
|
|
|
|
|
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
|
|
|
|
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
|
|
|
|
|
|
91, 92, 93, 94, 95, 96,
|
|
|
|
|
|
|
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
|
|
|
|
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
|
|
|
|
|
|
123,124,125,126,127,
|
|
|
|
|
|
|
|
128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
|
|
|
|
144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
|
|
|
|
160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
|
|
|
|
176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
|
|
|
|
|
|
|
|
192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
|
|
|
|
208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
|
|
|
|
224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
|
|
|
|
240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
|
|
|
|
};
|
|
|
|
|
|
|
|
#else
|
|
|
|
#error "Unsupported host character set"
|
|
|
|
#endif /* not ASCII */
|