diff options
| author | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
|---|---|---|
| committer | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
| commit | e5921a6fae9164c5f8ad6bb718db42f3f7a9e455 (patch) | |
| tree | b22c970391cc429da340ec007eb76294ea034b89 /contrib/tcsh/sh.char.h | |
| parent | 9b2f8ecbb332eb8e16c52d1731de9082d102e68b (diff) | |
| parent | 50eaa69b9f8628c1a960d67f9226b2178e1af1cb (diff) | |
| download | FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.zip FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.tar.gz | |
Update to tcsh 6.17.00.
Approved by: re (kensmith)
Diffstat (limited to 'contrib/tcsh/sh.char.h')
| -rw-r--r-- | contrib/tcsh/sh.char.h | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/contrib/tcsh/sh.char.h b/contrib/tcsh/sh.char.h index de2b5c0..eb20e69 100644 --- a/contrib/tcsh/sh.char.h +++ b/contrib/tcsh/sh.char.h @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.h,v 3.32 2006/09/26 16:44:37 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.h,v 3.35 2008/09/25 14:41:34 christos Exp $ */ /* * sh.char.h: Table for spotting special characters quickly * Makes for very obscure but efficient coding. @@ -64,7 +64,9 @@ extern unsigned short _mbmap_big5[]; extern unsigned short _mbmap_utf8[]; /* VARIABLE Check str */ /* same compiler require #define even not define DSPMBYTE */ +#undef _MB1 #define _MB1 0x0001 +#undef _MB2 #define _MB2 0x0002 #ifndef NLS @@ -72,21 +74,56 @@ extern tcshuc _cmap_lower[], _cmap_upper[]; #endif +#ifndef __QNXNTO__ +#undef _QF #define _QF 0x0001 /* '" (Forward quotes) */ +#undef _QB #define _QB 0x0002 /* ` (Backquote) */ +#undef _SP #define _SP 0x0004 /* space and tab */ +#else +#undef _XD +#define _XD 0x0001 /* As in <ctype.h> */ +#undef _UP +#define _UP 0x0002 /* As in <ctype.h> */ +#undef _SP +#define _SP 0x0004 /* As in <ctype.h> */ +#endif +#undef _NL #define _NL 0x0008 /* \n */ +#undef _META #define _META 0x0010 /* lex meta characters, sp #'`";&<>()|\t\n */ +#undef _GLOB #define _GLOB 0x0020 /* glob characters, *?{[` */ +#undef _ESC #define _ESC 0x0040 /* \ */ +#undef _DOL #define _DOL 0x0080 /* $ */ +#undef _DIG #define _DIG 0x0100 /* 0-9 */ +#undef _LET #define _LET 0x0200 /* a-z, A-Z, _, or locale-specific */ +#ifndef __QNXNTO__ +#undef _UP #define _UP 0x0400 /* A-Z, or locale-specific */ +#else +#undef _QF +#define _QF 0x0400 /* '" (Forward quotes) */ +#endif +#undef _DOW #define _DOW 0x0800 /* a-z, or locale-specific */ +#ifndef __QNXNTO__ +#undef _XD #define _XD 0x1000 /* 0-9, a-f, A-F */ +#else +#undef _QB +#define _QB 0x1000 /* 0-9, a-f, A-F */ +#endif +#undef _CMD #define _CMD 0x2000 /* lex end of command chars, ;&(|` */ +#undef _CTR #define _CTR 0x4000 /* control */ +#undef _PUN #define _PUN 0x8000 /* punctuation */ #ifdef IS_ASCII @@ -137,9 +174,12 @@ extern tcshuc _cmap_lower[], _cmap_upper[]; (iswalnum((tcshuc) (c)) || (c) == '_')) #else #define letter(c) (((Char)(c) & QUOTE) ? 0 : \ - (isalpha((tcshuc) (c)) || (c) == '_')) + ((isalpha((tcshuc) (c)) && !(cmap((c), _PUN))) \ + || (c) == '_')) #define alnum(c) (((Char)(c) & QUOTE) ? 0 : \ - (isalnum((tcshuc) (c)) || (c) == '_')) + ((isalnum((tcshuc) (c)) && !(cmap((c), _PUN))) \ + || (c) == '_')) + #endif #if defined(DSPMBYTE) |
