ObjFW  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [d15067685c]:

To Artifact [d3a3fd7540]:

︙
13
14
15
16
17
18
19

20
21
22
23
24
25
26

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27








+









#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#import "OFFile.h"
#import "OFAutoreleasePool.h"
#import "OFExceptions.h"

#import "TableGenerator.h"
#import "copyright.h"

@implementation TableGenerator
- init
{
︙
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

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








+









+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+








	OFString *line;

	pool2 = [[OFAutoreleasePool alloc] init];
	while ((line = [file readLine])) {
		OFArray *splitted;
		OFString **splitted_carray;
		of_unichar_t codep;
		int32_t tmp;

		splitted = [line splitWithDelimiter: @";"];
		if ([splitted count] != 15) {
			fprintf(stderr, "Invalid line: %s\n", [line cString]);
			exit(1);
		}
		splitted_carray = [splitted cArray];

		codep = [splitted_carray[0] hexadecimalValueAsInteger];

		upper[codep] = [splitted_carray[12] hexadecimalValueAsInteger];
		lower[codep] = [splitted_carray[13] hexadecimalValueAsInteger];
		tmp = [splitted_carray[12] hexadecimalValueAsInteger];
		if (tmp > 0)
			tmp -= codep;
		if (tmp > 0x8FFF || tmp < -0x9000)
			@throw [OFOutOfRangeException newWithClass: isa];
		upper[codep] = tmp;

		tmp = [splitted_carray[13] hexadecimalValueAsInteger];
		if (tmp > 0)
			tmp -= codep;
		if (tmp > 0x8FFF || tmp < -0x9000)
			@throw [OFOutOfRangeException newWithClass: isa];
		lower[codep] = tmp;

		[pool2 releaseObjects];
	}

	[pool release];
}
︙
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

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








-
+













-
+





-
+


-
+

-
+

+
-
+

















-
+





-
+


-
+

-
+

+
-
+














-
+
+


-
+
-
-




-
-
-








	OFFile *f = [OFFile fileWithPath: file
				    mode: @"wb"];

	[f writeString: COPYRIGHT
	    @"#include \"config.h\"\n"
	    @"\n"
	    @"#import \"OFString.h\"\n\n"
	    @"static const of_unichar_t nop_page[0x100] = {};\n\n"];
	    @"static const int16_t nop_page[0x100] = {};\n\n"];

	pool2 = [[OFAutoreleasePool alloc] init];

	/* Write upper_page_%d */
	for (i = 0; i < 0x110000; i += 0x100) {
		BOOL empty;

		empty = YES;

		for (j = i; j < i + 0x100; j++) {
			if (upper[j] != 0) {
				empty = NO;
				upper_size = i >> 8;
				upper_table_used[upper_size] = 1;
				upper_table_used[upper_size] = YES;
			}
		}

		if (!empty) {
			[f writeString: [OFString stringWithFormat:
			    @"static const of_unichar_t upper_page_%d[0x100] = "
			    @"static const int16_t upper_page_%d[0x100] = "
			    @"{\n", i >> 8]];

			for (j = i; j < i + 0x100; j += 4)
			for (j = i; j < i + 0x100; j += 8)
				[f writeString: [OFString stringWithFormat:
				    @"\t0x%06X, 0x%06X, 0x%06X, 0x%06X,\n",
				    @"\t%d, %d, %d, %d, %d, %d, %d, %d,\n",
				    upper[j], upper[j + 1], upper[j + 2],
				    upper[j + 3], upper[j + 4], upper[j + 5],
				    upper[j + 3]]];
				    upper[j + 6], upper[j + 7]]];

			[f writeString: @"};\n\n"];

			[pool2 releaseObjects];
		}
	}

	/* Write lower_page_%d */
	for (i = 0; i < 0x110000; i += 0x100) {
		BOOL empty;

		empty = YES;

		for (j = i; j < i + 0x100; j++) {
			if (lower[j] != 0) {
				empty = NO;
				lower_size = i >> 8;
				lower_table_used[lower_size] = 1;
				lower_table_used[lower_size] = YES;
			}
		}

		if (!empty) {
			[f writeString: [OFString stringWithFormat:
			    @"static const of_unichar_t lower_page_%d[0x100] = "
			    @"static const int16_t lower_page_%d[0x100] = "
			    @"{\n", i >> 8]];

			for (j = i; j < i + 0x100; j += 4)
			for (j = i; j < i + 0x100; j += 8)
				[f writeString: [OFString stringWithFormat:
				    @"\t0x%06X, 0x%06X, 0x%06X, 0x%06X,\n",
				    @"\t%d, %d, %d, %d, %d, %d, %d, %d,\n",
				    lower[j], lower[j + 1], lower[j + 2],
				    lower[j + 3], lower[j + 4], lower[j + 5],
				    lower[j + 3]]];
				    lower[j + 6], lower[j + 7]]];

			[f writeString: @"};\n\n"];

			[pool2 releaseObjects];
		}
	}

	/* Write cf_page_%d if it does NOT match lower_page_%d */
	for (i = 0; i < 0x110000; i += 0x100) {
		BOOL empty;

		empty = YES;

		for (j = i; j < i + 0x100; j++) {
			if (casefolding[j] != 0) {
			if (casefolding[j] != 0 &&
			    casefolding[j] != j + lower[j]) {
				empty = NO;
				casefolding_size = i >> 8;
				casefolding_table_used[casefolding_size] =
				casefolding_table_used[casefolding_size] = YES;
				    (memcmp(lower + i, casefolding + i, 256)
				    ? 1 : 2);
			}
		}

		if (!empty) {
			if (!memcmp(lower + i, casefolding + i, 256))
				continue;

			[f writeString: [OFString stringWithFormat:
			    @"static const of_unichar_t cf_page_%d[0x100] = {"
			    @"\n", i >> 8]];

			for (j = i; j < i + 0x100; j += 4)
				[f writeString: [OFString stringWithFormat:
				    @"\t0x%06X, 0x%06X, 0x%06X, 0x%06X,\n",
︙
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
257
258

259
260
261
262





263
264
265
266
267
268
269
270
271
272
273

274
275
276
277
278
279
280
281
282
283


284
285
286
287
288
289
290
291
292







293
294
295
296
297
298
299

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
257
258
259
260
261

262
263
264
265
266
267
268
269
270
271
272
273




274
275
276
277
278
279
280
281
282
283
284
285
286
287
288

289




290
291
292



293
294









295
296
297
298
299
300
301
302
303
304
305
306
307
308








-
+










+
-
-
-
-
+
+
+
+
+






-
+










+
-
-
-
-
+
+
+
+
+










-
+
-
-
-
-



-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+








	 */
	upper_size++;
	lower_size++;
	casefolding_size++;

	/* Write of_unicode_upper_table */
	[f writeString: [OFString stringWithFormat:
	    @"const of_unichar_t* const of_unicode_upper_table[0x%X] = {\n\t",
	    @"const int16_t* const of_unicode_upper_table[0x%X] = {\n\t",
	    upper_size]];

	for (i = 0; i < upper_size; i++) {
		if (upper_table_used[i]) {
			[f writeString: [OFString stringWithFormat:
			    @"upper_page_%d", i]];
			[pool2 releaseObjects];
		} else
			[f writeString: @"nop_page"];

		if (i + 1 < upper_size) {
		if ((i + 1) % 4 == 0)
			[f writeString: @",\n\t"];
		else if (i + 1 < upper_size)
			[f writeString: @", "];
			if ((i + 1) % 4 == 0)
				[f writeString: @",\n\t"];
			else
				[f writeString: @", "];
		}
	}

	[f writeString: @"\n};\n\n"];

	/* Write of_unicode_lower_table */
	[f writeString: [OFString stringWithFormat:
	    @"const of_unichar_t* const of_unicode_lower_table[0x%X] = {\n\t",
	    @"const int16_t* const of_unicode_lower_table[0x%X] = {\n\t",
	    lower_size]];

	for (i = 0; i < lower_size; i++) {
		if (lower_table_used[i]) {
			[f writeString: [OFString stringWithFormat:
			    @"lower_page_%d", i]];
			[pool2 releaseObjects];
		} else
			[f writeString: @"nop_page"];

		if (i + 1 < lower_size) {
		if ((i + 1) % 4 == 0)
			[f writeString: @",\n\t"];
		else if (i + 1 < lower_size)
			[f writeString: @", "];
			if ((i + 1) % 4 == 0)
				[f writeString: @",\n\t"];
			else
				[f writeString: @", "];
		}
	}

	[f writeString: @"\n};\n\n"];

	/* Write of_unicode_casefolding_table */
	[f writeString: [OFString stringWithFormat:
	    @"const of_unichar_t* const of_unicode_casefolding_table[0x%X] = {"
	    @"\n\t", casefolding_size]];

	for (i = 0; i < casefolding_size; i++) {
		switch (casefolding_table_used[i]) {
		if (casefolding_table_used[i]) {
		case 0:
			[f writeString: @"nop_page"];
			break;
		case 1:
			[f writeString: [OFString stringWithFormat:
			    @"cf_page_%d", i]];
			[pool2 releaseObjects];
			break;
		case 2:
			[f writeString: [OFString stringWithFormat:
		} else
			[f writeString: @"NULL"];
			    @"lower_page_%d", i]];
			[pool2 releaseObjects];
			break;
		}

		if ((i + 1) % 4 == 0)
			[f writeString: @",\n\t"];
		else if (i + 1 < casefolding_size)
			[f writeString: @", "];

		if (i + 1 < casefolding_size) {
			if ((i + 1) % 4 == 0)
				[f writeString: @",\n\t"];
			else
				[f writeString: @", "];
		}
	}

	[f writeString: @"\n};\n"];

	[pool release];
}
︙
309
310
311
312
313
314
315
316

317
318

319
320
321
322
323
324
325
326

318
319
320
321
322
323
324

325
326

327
328
329
330
331
332
333
334
335








-
+

-
+









	[f writeString: [OFString stringWithFormat:
	    @"#define OF_UNICODE_UPPER_TABLE_SIZE 0x%X\n"
	    @"#define OF_UNICODE_LOWER_TABLE_SIZE 0x%X\n"
	    @"#define OF_UNICODE_CASEFOLDING_TABLE_SIZE 0x%X\n\n",
	    upper_size, lower_size, casefolding_size]];

	[f writeString:
	    @"extern const of_unichar_t* const\n"
	    @"extern const int16_t* const\n"
	    @"    of_unicode_upper_table[OF_UNICODE_UPPER_TABLE_SIZE];\n"
	    @"extern const of_unichar_t* const\n"
	    @"extern const int16_t* const\n"
	    @"    of_unicode_lower_table[OF_UNICODE_LOWER_TABLE_SIZE];\n"
	    @"extern const of_unichar_t* const\n"
	    @"    of_unicode_casefolding_table["
	    @"OF_UNICODE_CASEFOLDING_TABLE_SIZE];\n"];

	[pool release];
}
@end
Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.021s