JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shrink chtypes array down to 8 bit

Browse Source 
saves 72 text and a lot bss
This commit is contained in:
tg
2006-11-09 23:39:16 +00:00
parent 6334091d86
commit 88bf6422d9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
misc.c
View File

@@ -3,10 +3,10 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.20 2006/11/09 20:53:41 tg Exp $\t" __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.21 2006/11/09 23:39:16 tg Exp $\t"
MKSH_SH_H_ID); MKSH_SH_H_ID);
short chtypes[UCHAR_MAX+1]; /* type bits for unsigned char */ unsigned char chtypes[UCHAR_MAX + 1]; /* type bits for unsigned char */
static int do_gmatch(const unsigned char *, const unsigned char *, static int do_gmatch(const unsigned char *, const unsigned char *,
const unsigned char *, const unsigned char *); const unsigned char *, const unsigned char *);
@@ -46,7 +46,6 @@ initctypes(void)
setctypes("*@#!$-?", C_VAR1); setctypes("*@#!$-?", C_VAR1);
setctypes(" \t\n", C_IFSWS); setctypes(" \t\n", C_IFSWS);
setctypes("=-+?", C_SUBOP1); setctypes("=-+?", C_SUBOP1);
setctypes("#%", C_SUBOP2);
setctypes(" \n\t\"#$&'()*;<>?[]\\`|", C_QUOTE); setctypes(" \n\t\"#$&'()*;<>?[]\\`|", C_QUOTE);
} }

12
sh.h
View File

@@ -8,7 +8,7 @@
/* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */
/* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */
#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.65 2006/11/09 22:18:10 tg Exp $" #define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.66 2006/11/09 23:39:16 tg Exp $"
#define MKSH_VERSION "R29 2006/11/09" #define MKSH_VERSION "R29 2006/11/09"
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
@@ -395,13 +395,15 @@ EXTERN int really_exit;
#define C_VAR1 BIT(3) /* *@#!$-? */ #define C_VAR1 BIT(3) /* *@#!$-? */
#define C_IFSWS BIT(4) /* \t \n (IFS white space) */ #define C_IFSWS BIT(4) /* \t \n (IFS white space) */
#define C_SUBOP1 BIT(5) /* "=-+?" */ #define C_SUBOP1 BIT(5) /* "=-+?" */
#define C_SUBOP2 BIT(6) /* "#%" */ #define C_SUBOP2 BIT(8) /* "#%" (not realised via chtypes array) */
#define C_IFS BIT(7) /* $IFS */ #define C_IFS BIT(7) /* $IFS */
#define C_QUOTE BIT(8) /* \n\t"#$&'()*;<>?[]\`| (needing quoting) */ #define C_QUOTE BIT(6) /* \n\t"#$&'()*;<>?[]\`| (needing quoting) */
extern short chtypes[]; extern unsigned char chtypes[];
#define ctype(c, t) !!(chtypes[(unsigned char)(c)]&(t)) #define ctype(c, t) !!(((t) == C_SUBOP2) ? \
(((c) == '#' || (c) == '%') ? 1 : 0) : \
(chtypes[(unsigned char)(c)]&(t)))
#define letter(c) ctype(c, C_ALPHA) #define letter(c) ctype(c, C_ALPHA)
#define digit(c) ctype(c, C_DIGIT) #define digit(c) ctype(c, C_DIGIT)
#define letnum(c) ctype(c, C_ALPHA|C_DIGIT) #define letnum(c) ctype(c, C_ALPHA|C_DIGIT)