d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Do not test for digit_contig in mksyntax.

Browse Source 
ISO/IEC 9899:1999 (E) 5.2.1p3 guarantees that the values of the characters
0123456789 are contiguous.

The generated syntax.c and syntax.h remain the same.

Submitted by:	Christoph Mallon
This commit is contained in:
Jilles Tjoelker 2013-02-05 22:54:09 +00:00
parent 51dc4fea4c
commit eaf7719957
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bin/sh/mksyntax.c
View File

@ -107,14 +107,12 @@ static const char *syntax[513];
static int base; static int base;
static int size; /* number of values which a char variable can have */ static int size; /* number of values which a char variable can have */
static int nbits; /* number of bits in a character */ static int nbits; /* number of bits in a character */
static int digit_contig;/* true if digits are contiguous */
static void filltable(const char *); static void filltable(const char *);
static void init(void); static void init(void);
static void add(const char *, const char *); static void add(const char *, const char *);
static void print(const char *); static void print(const char *);
static void output_type_macros(void); static void output_type_macros(void);
static void digit_convert(void);
int int
main(int argc __unused, char **argv __unused) main(int argc __unused, char **argv __unused)
@ -125,7 +123,6 @@ main(int argc __unused, char **argv __unused)
int i; int i;
char buf[80]; char buf[80];
int pos; int pos;
static char digit[] = "0123456789";
/* Create output files */ /* Create output files */
if ((cfile = fopen("syntax.c", "w")) == NULL) { if ((cfile = fopen("syntax.c", "w")) == NULL) {
@ -158,11 +155,6 @@ main(int argc __unused, char **argv __unused)
base = 1; base = 1;
if (sign) if (sign)
base += 1 << (nbits - 1); base += 1 << (nbits - 1);
digit_contig = 1;
for (i = 0 ; i < 10 ; i++) {
if (digit[i] != '0' + i)
digit_contig = 0;
}
fputs("#include <sys/cdefs.h>\n", hfile); fputs("#include <sys/cdefs.h>\n", hfile);
@ -248,8 +240,6 @@ main(int argc __unused, char **argv __unused)
add("_", "ISUNDER"); add("_", "ISUNDER");
add("#?$!-*@", "ISSPECL"); add("#?$!-*@", "ISSPECL");
print("is_type"); print("is_type");
if (! digit_contig)
digit_convert();
exit(0); exit(0);
} }
@ -341,12 +331,13 @@ print(const char *name)
*/ */
static const char *macro[] = { static const char *macro[] = {
"#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)",
"#define is_eof(c)\t((c) == PEOF)", "#define is_eof(c)\t((c) == PEOF)",
"#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", "#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))",
"#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", "#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))",
"#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", "#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))",
"#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))",
"#define digit_val(c)\t((c) - '0')",
NULL NULL
}; };
@ -355,41 +346,6 @@ output_type_macros(void)
{ {
const char **pp; const char **pp;
if (digit_contig)
macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)";
for (pp = macro ; *pp ; pp++) for (pp = macro ; *pp ; pp++)
fprintf(hfile, "%s\n", *pp); fprintf(hfile, "%s\n", *pp);
if (digit_contig)
fputs("#define digit_val(c)\t((c) - '0')\n", hfile);
else
fputs("#define digit_val(c)\t(digit_value[c])\n", hfile);
}
/*
* Output digit conversion table (if digits are not contiguous).
*/
static void
digit_convert(void)
{
int maxdigit;
static char digit[] = "0123456789";
char *p;
int i;
maxdigit = 0;
for (p = digit ; *p ; p++)
if (*p > maxdigit)
maxdigit = *p;
fputs("extern const char digit_value[];\n", hfile);
fputs("\n\nconst char digit_value[] = {\n", cfile);
for (i = 0 ; i <= maxdigit ; i++) {
for (p = digit ; *p && *p != i ; p++);
if (*p == '\0')
p = digit;
fprintf(cfile, " %d,\n", (int)(p - digit));
}
fputs("};\n", cfile);
} }