1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
From e908a3ad04bb40e425542b85fbb3a1eb5a38e194 Mon Sep 17 00:00:00 2001
From: Tee-Kiah Chia <tkchia@users.noreply.github.com>
Date: Thu, 27 Feb 2020 00:52:05 +0800
Subject: [PATCH] [cpp] update token1.tok to make new gperf happy; regen.
token1.h
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Upstream-Status: Pending [it was submitted in https://github.com/jbruchon/dev86/pull/19
but then closed by author]
---
cpp/token1.h | 170 +++++++++++++++++++++++++++++++++----------------
cpp/token1.tok | 2 +-
2 files changed, 115 insertions(+), 57 deletions(-)
diff --git a/cpp/token1.h b/cpp/token1.h
index 2e2b9eb..bb313aa 100644
--- a/cpp/token1.h
+++ b/cpp/token1.h
@@ -1,15 +1,48 @@
-/* C code produced by gperf version 2.7.1 (19981006 egcs) */
+/* C code produced by gperf version 3.0.4 */
/* Command-line: gperf -aptTc -N is_ctok -H hash1 token1.tok */
+/* Computed positions: -k'1-2' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
#define TOTAL_KEYWORDS 23
#define MIN_WORD_LENGTH 2
#define MAX_WORD_LENGTH 3
#define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 63
-/* maximum key range = 62, duplicates = 0 */
+#define MAX_HASH_VALUE 62
+/* maximum key range = 61, duplicates = 0 */
#ifdef __GNUC__
__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
#endif
static unsigned int
hash1 (str, len)
@@ -18,38 +51,41 @@ hash1 (str, len)
{
static unsigned char asso_values[] =
{
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 1, 64, 64, 64, 3, 25, 64,
- 64, 64, 13, 18, 64, 8, 30, 15, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 5, 0, 20, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 30, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 23, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
- 64, 64, 64, 64, 64, 64
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 6, 63, 63, 63, 28, 8, 63,
+ 63, 63, 23, 3, 63, 25, 20, 18, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 10, 5, 0, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 13, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 30, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63
};
- return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
+ return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]];
}
#ifdef __GNUC__
__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
#endif
struct token_trans *
is_ctok (str, len)
@@ -59,46 +95,68 @@ is_ctok (str, len)
static struct token_trans wordlist[] =
{
{""}, {""},
+#line 14 "token1.tok"
+ {">>", TK_RIGHT_OP},
+#line 4 "token1.tok"
+ {">>=", TK_RIGHT_ASSIGN},
+ {""}, {""}, {""},
+#line 22 "token1.tok"
+ {">=", TK_GE_OP},
+#line 16 "token1.tok"
+ {"++", TK_INC_OP},
+ {""},
+#line 6 "token1.tok"
+ {"+=", TK_ADD_ASSIGN},
+ {""},
+#line 23 "token1.tok"
{"==", TK_EQ_OP},
+#line 24 "token1.tok"
{"!=", TK_NE_OP},
{""},
- {"%=", TK_MOD_ASSIGN},
+#line 11 "token1.tok"
+ {"&=", TK_AND_ASSIGN},
{""},
+#line 21 "token1.tok"
{"<=", TK_LE_OP},
- {"<<=", TK_LEFT_ASSIGN},
+#line 19 "token1.tok"
+ {"&&", TK_AND_OP},
{""},
- {"-=", TK_SUB_ASSIGN},
+#line 12 "token1.tok"
+ {"^=", TK_XOR_ASSIGN},
{""},
+#line 15 "token1.tok"
{"<<", TK_LEFT_OP},
- {""}, {""},
- {"*=", TK_MUL_ASSIGN},
+#line 5 "token1.tok"
+ {"<<=", TK_LEFT_ASSIGN},
{""},
+#line 9 "token1.tok"
{"/=", TK_DIV_ASSIGN},
- {"--", TK_DEC_OP},
{""},
- {"+=", TK_ADD_ASSIGN},
- {""},
- {">=", TK_GE_OP},
- {">>=", TK_RIGHT_ASSIGN},
- {""},
- {"|=", TK_OR_ASSIGN},
+#line 18 "token1.tok"
+ {"->", TK_PTR_OP},
+ {""}, {""},
+#line 8 "token1.tok"
+ {"*=", TK_MUL_ASSIGN},
{""},
- {"&=", TK_AND_ASSIGN},
+#line 7 "token1.tok"
+ {"-=", TK_SUB_ASSIGN},
{""}, {""},
- {"->", TK_PTR_OP},
+#line 10 "token1.tok"
+ {"%=", TK_MOD_ASSIGN},
{""},
- {"^=", TK_XOR_ASSIGN},
- {""}, {""}, {""}, {""}, {""},
- {"++", TK_INC_OP},
- {""}, {""}, {""},
- {">>", TK_RIGHT_OP},
- {""}, {""}, {""}, {""}, {""},
- {"||", TK_OR_OP},
- {""}, {""}, {""},
- {"&&", TK_AND_OP},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 13 "token1.tok"
+ {"|=", TK_OR_ASSIGN},
+ {""}, {""}, {""}, {""},
+#line 25 "token1.tok"
{"..", TK_WORD},
- {"...", TK_ELLIPSIS}
+#line 3 "token1.tok"
+ {"...", TK_ELLIPSIS},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 17 "token1.tok"
+ {"--", TK_DEC_OP},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 20 "token1.tok"
+ {"||", TK_OR_OP}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -109,7 +167,7 @@ is_ctok (str, len)
{
register const char *s = wordlist[key].name;
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key];
}
}
diff --git a/cpp/token1.tok b/cpp/token1.tok
index cd668ce..a98926f 100644
--- a/cpp/token1.tok
+++ b/cpp/token1.tok
@@ -7,7 +7,7 @@ struct token_trans { char * name; int token; };
-=, TK_SUB_ASSIGN
*=, TK_MUL_ASSIGN
/=, TK_DIV_ASSIGN
-%=, TK_MOD_ASSIGN
+"%=", TK_MOD_ASSIGN
&=, TK_AND_ASSIGN
^=, TK_XOR_ASSIGN
|=, TK_OR_ASSIGN
|
