convert to the new fast character classes

This commit is contained in:
tg 2017-04-27 19:16:10 +00:00
parent 5c6936ddc8
commit b228c59895
5 changed files with 68 additions and 98 deletions

4
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.203 2017/04/22 00:07:08 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.204 2017/04/27 19:16:07 tg Exp $");
/* /*
* string expansion * string expansion
@ -1224,7 +1224,7 @@ varsub(Expand *xp, const char *sp, const char *word,
} }
} else if (stype == 0x80 && (c == ' ' || c == '0')) { } else if (stype == 0x80 && (c == ' ' || c == '0')) {
stype |= '0'; stype |= '0';
} else if (ctype(c, C_SUBOP1)) { } else if (ctype(c, C_SUB1)) {
slen += 2; slen += 2;
stype |= c; stype |= c;
} else if (ksh_issubop2(c)) { } else if (ksh_issubop2(c)) {

52
main.c
View File

@ -34,7 +34,7 @@
#include <locale.h> #include <locale.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.335 2017/04/27 18:44:35 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/main.c,v 1.336 2017/04/27 19:16:08 tg Exp $");
extern char **environ; extern char **environ;
@ -236,6 +236,8 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
ssize_t k; ssize_t k;
#endif #endif
set_ifs(TC_IFSWS);
#ifdef __OS2__ #ifdef __OS2__
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
if (!isatty(i)) if (!isatty(i))
@ -333,9 +335,6 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
initvar(); initvar();
/*XXX do this earlier, just call set_ifs(TC_IFSWS); with the new scheme, then ifs0 need not be E_INITd, drop initctypes and setctypes from misc.c/sh.h then */
initctypes();
inittraps(); inittraps();
coproc_init(); coproc_init();
@ -431,23 +430,40 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
shellf(" .\n"); \ shellf(" .\n"); \
} while (0) } while (0)
#define dmpct(a,b) dmpcf(a,ctype(c,b)) #define dmpct(a,b) dmpcf(a,ctype(c,b))
dmpct("C_ALIAS",C_ALIAS);
dmpct("C_ALNUM",C_ALNUM);
dmpct("C_ALNUX",C_ALNUX);
dmpct("C_ALPHA",C_ALPHA);
dmpct("C_ALPHX",C_ALPHX); dmpct("C_ALPHX",C_ALPHX);
dmpct("C_BLANK",C_BLANK);
dmpct("C_CFS",C_CFS);
dmpct("C_CNTRL",C_CNTRL);
dmpct("C_DIGIT",C_DIGIT); dmpct("C_DIGIT",C_DIGIT);
dmpct("C_LEX1",C_LEX1); dmpct("C_DOLAR",C_DOLAR);
dmpct("C_VAR1",C_VAR1); dmpct("C_GRAPH",C_GRAPH);
dmpct("C_IFSWS",C_IFSWS); dmpct("C_HEXLT",C_HEXLT);
dmpct("C_SUB1",C_SUBOP1);
dmpct("C_QUOTE",C_QUOTE);
dmpct("C_IFS",C_IFS); dmpct("C_IFS",C_IFS);
dmpcf("C_SUB2",ksh_issubop2(c)); dmpct("C_IFSWS",C_IFSWS);
dmpcf("C_ALIAS",ksh_isalias(c)); dmpct("C_LEX1",C_LEX1);
dmpcf("C_ALPHA",ksh_isalpha(c)); dmpct("C_LF",C_LF);
dmpcf("C_ALNUX",ksh_isalnux(c)); dmpct("C_LOWER",C_LOWER);
dmpcf("C_LOWER",ksh_islower(c)); dmpct("C_MFS",C_MFS);
dmpcf("C_UPPER",ksh_isupper(c)); dmpct("C_NL",C_NL);
dmpcf("C_SPACE",ksh_isspace(c)); dmpct("C_NUL",C_NUL);
dmpcf("C_CFS",is_cfs(c)); dmpct("C_OCTAL",C_OCTAL);
dmpcf("C_MFS",is_mfs(c)); dmpct("C_PRINT",C_PRINT);
dmpct("C_PUNCT",C_PUNCT);
dmpct("C_QC",C_QC);
dmpct("C_QUOTE",C_QUOTE);
dmpct("C_SEDEC",C_SEDEC);
dmpct("C_SPACE",C_SPACE);
dmpct("C_SPC",C_SPC);
dmpct("C_SUB1",C_SUB1);
dmpct("C_SUB2",C_SUB2);
dmpct("C_TAB",C_TAB);
dmpct("C_UNDER",C_UNDER);
dmpct("C_UPPER",C_UPPER);
dmpct("C_VAR1",C_VAR1);
exit(0); exit(0);
/* assign default shell variable values */ /* assign default shell variable values */

33
misc.c
View File

@ -30,7 +30,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.258 2017/04/21 20:06:05 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.259 2017/04/27 19:16:08 tg Exp $");
#define KSH_CHVT_FLAG #define KSH_CHVT_FLAG
#ifdef MKSH_SMALL #ifdef MKSH_SMALL
@ -68,37 +68,6 @@ static int make_path(const char *, const char *, char **, XString *, int *);
#define DO_SETUID(func, argvec) func argvec #define DO_SETUID(func, argvec) func argvec
#endif #endif
/*
* Fast character classes
*/
void
setctypes(const char *s, int t)
{
if (t & C_IFS) {
unsigned int i = 0;
while (++i <= UCHAR_MAX)
chtypes[i] &= ~C_IFS;
/* include '\0' in C_IFS */
chtypes[0] |= C_IFS;
}
while (*s != 0)
chtypes[(unsigned char)*s++] |= t;
}
void
initctypes(void)
{
setctypes(letters_uc, C_ALPHX);
setctypes(letters_lc, C_ALPHX);
chtypes['_'] |= C_ALPHX;
setctypes("0123456789", C_DIGIT);
setctypes(TC_LEX1, C_LEX1);
setctypes("*@#!$-?", C_VAR1);
setctypes(TC_IFSWS, C_IFSWS);
setctypes("=-+?", C_SUBOP1);
setctypes("\t\n \"#$&'()*;<=>?[\\]`|", C_QUOTE);
}
/* called from XcheckN() to grow buffer */ /* called from XcheckN() to grow buffer */
char * char *

69
sh.h
View File

@ -175,7 +175,7 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.814 2017/04/22 00:07:09 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.815 2017/04/27 19:16:09 tg Exp $");
#endif #endif
#define MKSH_VERSION "R55 2017/04/20" #define MKSH_VERSION "R55 2017/04/20"
@ -533,8 +533,6 @@ EXTERN const char initvsn[] E_INIT("KSH_VERSION=@(#)" KSH_VERSIONNAME_ISLEGACY \
EXTERN const char digits_uc[] E_INIT("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"); EXTERN const char digits_uc[] E_INIT("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
EXTERN const char digits_lc[] E_INIT("0123456789abcdefghijklmnopqrstuvwxyz"); EXTERN const char digits_lc[] E_INIT("0123456789abcdefghijklmnopqrstuvwxyz");
#define letters_uc (digits_uc + 10)
#define letters_lc (digits_lc + 10)
/* /*
* Evil hack for const correctness due to API brokenness * Evil hack for const correctness due to API brokenness
@ -868,8 +866,7 @@ EXTERN char null[] E_INIT("");
EXTERN const char T4spaces[] E_INIT(" "); EXTERN const char T4spaces[] E_INIT(" ");
#define T1space (Treal_sp2 + 5) #define T1space (Treal_sp2 + 5)
#define Tcolsp (Tf_sD_ + 2) #define Tcolsp (Tf_sD_ + 2)
EXTERN const char TC_LEX1[] E_INIT("|&;<>() \t\n"); #define TC_IFSWS (TinitIFS + 4)
#define TC_IFSWS (TC_LEX1 + 7)
EXTERN const char TinitIFS[] E_INIT("IFS= \t\n"); EXTERN const char TinitIFS[] E_INIT("IFS= \t\n");
EXTERN const char TFCEDIT_dollaru[] E_INIT("${FCEDIT:-/bin/ed} $_"); EXTERN const char TFCEDIT_dollaru[] E_INIT("${FCEDIT:-/bin/ed} $_");
#define Tspdollaru (TFCEDIT_dollaru + 18) #define Tspdollaru (TFCEDIT_dollaru + 18)
@ -1030,7 +1027,6 @@ EXTERN const char T_devtty[] E_INIT("/dev/tty");
#define T4spaces " " #define T4spaces " "
#define T1space " " #define T1space " "
#define Tcolsp ": " #define Tcolsp ": "
#define TC_LEX1 "|&;<>() \t\n"
#define TC_IFSWS " \t\n" #define TC_IFSWS " \t\n"
#define TinitIFS "IFS= \t\n" #define TinitIFS "IFS= \t\n"
#define TFCEDIT_dollaru "${FCEDIT:-/bin/ed} $_" #define TFCEDIT_dollaru "${FCEDIT:-/bin/ed} $_"
@ -1321,8 +1317,9 @@ EXTERN bool really_exit;
extern const uint32_t tpl_ctypes[128]; extern const uint32_t tpl_ctypes[128];
/* run-time, contains C_IFS as well, full 2⁸ octet range */ /* run-time, contains C_IFS as well, full 2⁸ octet range */
EXTERN uint32_t ksh_ctypes[256]; EXTERN uint32_t ksh_ctypes[256];
/* first octet of $IFS, for concatenating "$*" */
EXTERN char ifs0;
#if 0
/* external types */ /* external types */
/* 0‥9A‥Za‥z!%,-.@ valid characters in alias name */ /* 0‥9A‥Za‥z!%,-.@ valid characters in alias name */
@ -1391,50 +1388,36 @@ EXTERN uint32_t ksh_ctypes[256];
#define C_SPC CiSP /* \x20 ASCII space */ #define C_SPC CiSP /* \x20 ASCII space */
#define C_TAB CiTAB /* \x09 ASCII horizontal tabulator */ #define C_TAB CiTAB /* \x09 ASCII horizontal tabulator */
#define C_UNDER CiUNDER /* _ underscore */ #define C_UNDER CiUNDER /* _ underscore */
#endif
/* legacy not-so-fast character classes */ /* identity transform of octet */
#define C_ALPHX BIT(0) /* A-Za-z_ */
#define C_DIGIT BIT(1) /* 0-9 */
#define C_LEX1 BIT(2) /* \t \n\0|&;<>() */
#define C_VAR1 BIT(3) /* *@#!$-? */
#define C_IFSWS BIT(4) /* \t \n (IFS white space) */
#define C_SUBOP1 BIT(5) /* "=-+?" */
#define C_QUOTE BIT(6) /* \t\n "#$&'()*;<=>?[\]`| (needing quoting) */
#define C_IFS BIT(7) /* $IFS */
extern unsigned char chtypes[];
#define ctype(c, t) tobool(chtypes[(unsigned char)(c)] & (t))
#define ord(c) ((unsigned int)(unsigned char)(c)) #define ord(c) ((unsigned int)(unsigned char)(c))
/* identity transformation in !EBCDIC; Unicode map (or higher) in EBCDIC */ /* identity transformation in !EBCDIC; ASCII or high in EBCDIC */
#define asc(c) ord(c) #define asc(c) ord(c)
#define ksh_issubop2(c) tobool(ord(c) == ord('#') || ord(c) == ord('%')) /* EBCDIC needs to compare c with both u and l */
#define ksh_isalias(c) (ctype((c), C_ALPHX | C_DIGIT) || \ #define ksh_eq(c,u,l) (((c) | 0x20) == (l))
ord(c) == ord('!') || ord(c) == ord('%') || \ /* new fast character classes */
ord(c) == ord(',') || ord(c) == ord('.') || \ #define ctype(c, t) tobool(ksh_ctypes[ord(c)] & (t))
ord(c) == ord('@') || ord(c) == ord('-')) /* helper functions */
#define ksh_isalpha(c) (ctype((c), C_ALPHX) && ord(c) != ord('_')) #define ksh_isdash(s) tobool(ord((s)[0]) == '-' && ord((s)[1]) == '\0')
#define ksh_isalphx(c) ctype((c), C_ALPHX) /* invariant distance even in EBCDIC */
#define ksh_isalnux(c) ctype((c), C_ALPHX | C_DIGIT)
#define ksh_isdigit(c) ctype((c), C_DIGIT)
#define ksh_islower(c) ((asc(c) >= asc('a')) && (asc(c) <= asc('z')))
#define ksh_isupper(c) ((asc(c) >= asc('A')) && (asc(c) <= asc('Z')))
#define ksh_tolower(c) (ksh_isupper(c) ? (c) - 'A' + 'a' : (c)) #define ksh_tolower(c) (ksh_isupper(c) ? (c) - 'A' + 'a' : (c))
#define ksh_toupper(c) (ksh_islower(c) ? (c) - 'a' + 'A' : (c)) #define ksh_toupper(c) (ksh_islower(c) ? (c) - 'a' + 'A' : (c))
#define ksh_isdash(s) (((s)[0] == '-') && ((s)[1] == '\0'))
#define ksh_isspace(c) ((((c) >= 0x09) && ((c) <= 0x0D)) || ((c) == 0x20))
/* EBCDIC needs to compare c with both */
#define ksh_eq(c,u,l) (((c) | 0x20) == (l))
/* strictly speaking asc() here, but this works even in EBCDIC */ /* strictly speaking asc() here, but this works even in EBCDIC */
#define ksh_numdig(c) (ord(c) - ord('0')) #define ksh_numdig(c) (ord(c) - ord('0'))
#define ksh_numuc(c) (asc(c) - asc('A')) #define ksh_numuc(c) (asc(c) - asc('A'))
#define ksh_numlc(c) (asc(c) - asc('a')) #define ksh_numlc(c) (asc(c) - asc('a'))
#define is_cfs(c) ((c) == ' ' || (c) == '\t' || (c) == '"' || (c) == '\'') /* legacy */ /* legacy functions */
#define is_mfs(c) (!(ksh_isalnux(c) || (c) == '$' || ((c) & 0x80))) /* legacy */ #define ksh_issubop2(c) ctype((c), C_SUB2)
#define ksh_isalias(c) ctype((c), C_ALIAS)
EXTERN char ifs0 E_INIT(' '); /* for "$*" */ #define ksh_isalpha(c) ctype((c), C_ALPHA)
#define ksh_isalphx(c) ctype((c), C_ALPHX)
#define ksh_isalnux(c) ctype((c), C_ALNUX)
#define ksh_isdigit(c) ctype((c), C_DIGIT)
#define ksh_islower(c) ctype((c), C_LOWER)
#define ksh_isupper(c) ctype((c), C_UPPER)
#define ksh_isspace(c) ctype((c), C_SPACE)
#define is_cfs(c) ctype((c), C_CFS)
#define is_mfs(c) ctype((c), C_MFS)
/* Argument parsing for built-in commands and getopts command */ /* Argument parsing for built-in commands and getopts command */
@ -2390,8 +2373,6 @@ void DF(const char *, ...)
MKSH_A_FORMAT(__printf__, 1, 2); MKSH_A_FORMAT(__printf__, 1, 2);
#endif #endif
/* misc.c */ /* misc.c */
void setctypes(const char *, int);
void initctypes(void);
size_t option(const char *) MKSH_A_PURE; size_t option(const char *) MKSH_A_PURE;
char *getoptions(void); char *getoptions(void);
void change_flag(enum sh_flag, int, bool); void change_flag(enum sh_flag, int, bool);

8
shf.c
View File

@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/shf.c,v 1.80 2017/04/22 00:07:10 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/shf.c,v 1.81 2017/04/27 19:16:10 tg Exp $");
/* flags to shf_emptybuf() */ /* flags to shf_emptybuf() */
#define EB_READSW 0x01 /* about to switch to reading */ #define EB_READSW 0x01 /* about to switch to reading */
@ -1222,6 +1222,10 @@ const uint32_t tpl_ctypes[128] = {
void void
set_ifs(const char *s) set_ifs(const char *s)
{ {
setctypes(s, C_IFS);
ifs0 = *s; ifs0 = *s;
memcpy(ksh_ctypes, tpl_ctypes, sizeof(tpl_ctypes));
memset(ksh_ctypes + sizeof(tpl_ctypes), '\0',
sizeof(ksh_ctypes) - sizeof(tpl_ctypes));
while (*s)
ksh_ctypes[ord(*s++)] |= CiIFS;
} }