diff options
Diffstat (limited to 'gcc/java/lex.h')
| -rw-r--r-- | gcc/java/lex.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gcc/java/lex.h b/gcc/java/lex.h index ef9e6e4..a458926 100644 --- a/gcc/java/lex.h +++ b/gcc/java/lex.h @@ -250,33 +250,25 @@ extern void java_destroy_lexer PARAMS ((java_lexer *)); #define RANGE(c, l, h) (((c) >= l && (c) <= h)) #define JAVA_WHITE_SPACE_P(c) (c == ' ' || c == '\t' || c == '\f') #define JAVA_START_CHAR_P(c) ((c < 128 \ - && (RANGE (c, 'A', 'Z') \ - || RANGE (c, 'a', 'z') \ - || c == '_' \ - || c == '$')) \ + && (ISIDST (c) || c == '$')) \ || (c >= 128 && java_start_char_p (c))) #define JAVA_PART_CHAR_P(c) ((c < 128 \ - && (RANGE (c, 'A', 'Z') \ - || RANGE (c, 'a', 'z') \ - || RANGE (c, '0', '9') \ - || c == '_' \ + && (ISIDNUM (c) \ || c == '$' \ || c == 0x0000 \ || RANGE (c, 0x01, 0x08) \ || RANGE (c, 0x0e, 0x1b) \ || c == 0x7f)) \ || (c >= 128 && java_part_char_p (c))) -#define JAVA_ASCII_DIGIT(c) RANGE (c, '0', '9') +#define JAVA_ASCII_DIGIT(c) ISDIGIT (c) #define JAVA_ASCII_OCTDIGIT(c) RANGE (c, '0', '7') -#define JAVA_ASCII_HEXDIGIT(c) (RANGE (c, '0', '9') || \ - RANGE (c, 'a', 'f') || \ - RANGE (c, 'A', 'F')) +#define JAVA_ASCII_HEXDIGIT(c) ISXDIGIT (c) #define JAVA_ASCII_FPCHAR(c) (RANGE (c, 'd', 'f') || RANGE (c, 'D', 'F') || \ c == '.' || JAVA_ASCII_DIGIT (c)) #define JAVA_FP_SUFFIX(c) (c == 'D' || c == 'd' || c == 'f' || c == 'F') #define JAVA_FP_EXP(c) (c == 'E' || c == 'F') #define JAVA_FP_PM(c) (c == '-' || c == '+') -#define JAVA_ASCII_LETTER(c) (RANGE (c, 'a', 'z') || RANGE (c, 'A', 'Z')) +#define JAVA_ASCII_LETTER(c) ISALPHA (c) /* Constants */ #define JAVA_READ_BUFFER 256 |