Skip to content

Commit 28aed75

Browse files
calvin-wan-googlegitster
authored andcommitted
kwset: move translation table from ctype
This table was originally introduced to solely be used with kwset machinery (0f871cf), so it would make sense for it to belong in kwset.[ch] rather than ctype.c and git-compat-util.h. It is only used in diffcore-pickaxe.c, which already includes kwset.h so no other headers have to be modified. Signed-off-by: Calvin Wan <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1890ce8 commit 28aed75

File tree

4 files changed

+38
-39
lines changed

4 files changed

+38
-39
lines changed

ctype.c

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,39 +28,3 @@ const unsigned char sane_ctype[256] = {
2828
A, A, A, A, A, A, A, A, A, A, A, R, R, U, P, X, /* 112..127 */
2929
/* Nothing in the 128.. range */
3030
};
31-
32-
/* For case-insensitive kwset */
33-
const unsigned char tolower_trans_tbl[256] = {
34-
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
35-
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
36-
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
37-
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
38-
' ', '!', '"', '#', '$', '%', '&', 0x27,
39-
'(', ')', '*', '+', ',', '-', '.', '/',
40-
'0', '1', '2', '3', '4', '5', '6', '7',
41-
'8', '9', ':', ';', '<', '=', '>', '?',
42-
'@', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
43-
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
44-
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
45-
'x', 'y', 'z', '[', 0x5c, ']', '^', '_',
46-
'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
47-
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
48-
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
49-
'x', 'y', 'z', '{', '|', '}', '~', 0x7f,
50-
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
51-
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
52-
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
53-
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
54-
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
55-
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
56-
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
57-
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
58-
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
59-
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
60-
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
61-
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
62-
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
63-
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
64-
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
65-
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
66-
};

git-compat-util.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,9 +1150,6 @@ static inline size_t xsize_t(off_t len)
11501150
#define HOST_NAME_MAX 256
11511151
#endif
11521152

1153-
/* in ctype.c, for kwset users */
1154-
extern const unsigned char tolower_trans_tbl[256];
1155-
11561153
#include "sane-ctype.h"
11571154

11581155
/*

kwset.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,42 @@ static void *obstack_chunk_alloc(long size)
4949

5050
#define U(c) ((unsigned char) (c))
5151

52+
/* For case-insensitive kwset */
53+
const unsigned char tolower_trans_tbl[256] = {
54+
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
55+
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
56+
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
57+
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
58+
' ', '!', '"', '#', '$', '%', '&', 0x27,
59+
'(', ')', '*', '+', ',', '-', '.', '/',
60+
'0', '1', '2', '3', '4', '5', '6', '7',
61+
'8', '9', ':', ';', '<', '=', '>', '?',
62+
'@', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
63+
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
64+
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
65+
'x', 'y', 'z', '[', 0x5c, ']', '^', '_',
66+
'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
67+
'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
68+
'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
69+
'x', 'y', 'z', '{', '|', '}', '~', 0x7f,
70+
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
71+
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
72+
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
73+
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
74+
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
75+
0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
76+
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
77+
0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
78+
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
79+
0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
80+
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
81+
0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
82+
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
83+
0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
84+
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
85+
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
86+
};
87+
5288
/* Balanced tree of edges and labels leaving a given trie node. */
5389
struct tree
5490
{

kwset.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
The author may be reached (Email) at the address [email protected],
2727
or (US mail) as Mike Haertel c/o Free Software Foundation. */
2828

29+
extern const unsigned char tolower_trans_tbl[256];
30+
2931
struct kwsmatch
3032
{
3133
int index; /* Index number of matching keyword. */

0 commit comments

Comments
 (0)