ObjFW  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [49cee2e98a]:

To Artifact [504a2316bf]:

︙
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

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








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




















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








	    ![string hasPrefix: @"\f"] && ![string hasSuffix: @" "] &&
	    ![string hasSuffix: @"\t"] && ![string hasSuffix: @"\f"] &&
	    ![string containsString: @"\""])
		return string;

	mutableString = [[string mutableCopy] autorelease];

	[mutableString replaceOccurrencesOfString: @"\\"
	[mutableString replaceOccurrencesOfString: @"\\" withString: @"\\\\"];
				       withString: @"\\\\"];
	[mutableString replaceOccurrencesOfString: @"\f"
	[mutableString replaceOccurrencesOfString: @"\f" withString: @"\\f"];
				       withString: @"\\f"];
	[mutableString replaceOccurrencesOfString: @"\r"
	[mutableString replaceOccurrencesOfString: @"\r" withString: @"\\r"];
				       withString: @"\\r"];
	[mutableString replaceOccurrencesOfString: @"\n"
	[mutableString replaceOccurrencesOfString: @"\n" withString: @"\\n"];
				       withString: @"\\n"];
	[mutableString replaceOccurrencesOfString: @"\""
	[mutableString replaceOccurrencesOfString: @"\"" withString: @"\\\""];
				       withString: @"\\\""];

	[mutableString prependString: @"\""];
	[mutableString appendString: @"\""];

	[mutableString makeImmutable];

	return mutableString;
}

static OFString *
unescapeString(OFString *string)
{
	OFMutableString *mutableString;

	if (![string hasPrefix: @"\""] || ![string hasSuffix: @"\""])
		return string;

	string = [string substringWithRange: of_range(1, string.length - 2)];
	mutableString = [[string mutableCopy] autorelease];

	[mutableString replaceOccurrencesOfString: @"\\f"
	[mutableString replaceOccurrencesOfString: @"\\f" withString: @"\f"];
				       withString: @"\f"];
	[mutableString replaceOccurrencesOfString: @"\\r"
	[mutableString replaceOccurrencesOfString: @"\\r" withString: @"\r"];
				       withString: @"\r"];
	[mutableString replaceOccurrencesOfString: @"\\n"
	[mutableString replaceOccurrencesOfString: @"\\n" withString: @"\n"];
				       withString: @"\n"];
	[mutableString replaceOccurrencesOfString: @"\\\""
	[mutableString replaceOccurrencesOfString: @"\\\"" withString: @"\""];
				       withString: @"\""];
	[mutableString replaceOccurrencesOfString: @"\\\\"
	[mutableString replaceOccurrencesOfString: @"\\\\" withString: @"\\"];
				       withString: @"\\"];

	[mutableString makeImmutable];

	return mutableString;
}

@implementation OFINICategoryPair
︙
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
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

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

264
265
266
267
268
269
270
271








-
+

-
+
-


-
-
+
+
















-
-
+
+


-
+
-












-
-
+


-
+
-

















-
-
+


-
+
-












-
-
+


-
+
-












-
+









		comment->_comment = [line copy];

		[_lines addObject: comment];
	}
}

- (OFString *)stringValueForKey: (OFString *)key
- (OFString *)stringForKey: (OFString *)key
{
	return [self stringValueForKey: key
	return [self stringForKey: key defaultValue: nil];
			  defaultValue: nil];
}

- (OFString *)stringValueForKey: (OFString *)key
		   defaultValue: (OFString *)defaultValue
- (OFString *)stringForKey: (OFString *)key
	      defaultValue: (OFString *)defaultValue
{
	for (id line in _lines) {
		OFINICategoryPair *pair;

		if (![line isKindOfClass: [OFINICategoryPair class]])
			continue;

		pair = line;

		if ([pair->_key isEqual: key])
			return [[pair->_value copy] autorelease];
	}

	return defaultValue;
}

- (long long)longLongValueForKey: (OFString *)key
		    defaultValue: (long long)defaultValue
- (long long)longLongForKey: (OFString *)key
	       defaultValue: (long long)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *value = [self stringValueForKey: key
	OFString *value = [self stringForKey: key defaultValue: nil];
				     defaultValue: nil];
	long long ret;

	if (value != nil)
		ret = [value longLongValueWithBase: 0];
	else
		ret = defaultValue;

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (bool)boolValueForKey: (OFString *)key
	   defaultValue: (bool)defaultValue
- (bool)boolForKey: (OFString *)key defaultValue: (bool)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *value = [self stringValueForKey: key
	OFString *value = [self stringForKey: key defaultValue: nil];
				     defaultValue: nil];
	bool ret;

	if (value != nil) {
		if ([value isEqual: @"true"])
			ret = true;
		else if ([value isEqual: @"false"])
			ret = false;
		else
			@throw [OFInvalidFormatException exception];
	} else
		ret = defaultValue;

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (float)floatValueForKey: (OFString *)key
	     defaultValue: (float)defaultValue
- (float)floatForKey: (OFString *)key defaultValue: (float)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *value = [self stringValueForKey: key
	OFString *value = [self stringForKey: key defaultValue: nil];
				     defaultValue: nil];
	float ret;

	if (value != nil)
		ret = value.floatValue;
	else
		ret = defaultValue;

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (double)doubleValueForKey: (OFString *)key
	       defaultValue: (double)defaultValue
- (double)doubleForKey: (OFString *)key defaultValue: (double)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *value = [self stringValueForKey: key
	OFString *value = [self stringForKey: key defaultValue: nil];
				     defaultValue: nil];
	double ret;

	if (value != nil)
		ret = value.doubleValue;
	else
		ret = defaultValue;

	objc_autoreleasePoolPop(pool);

	return ret;
}

- (OFArray OF_GENERIC(OFString *) *)stringValuesForKey: (OFString *)key
- (OFArray OF_GENERIC(OFString *) *)stringArrayForKey: (OFString *)key
{
	OFMutableArray *ret = [OFMutableArray array];
	void *pool = objc_autoreleasePoolPush();

	for (id line in _lines) {
		OFINICategoryPair *pair;
︙
299
300
301
302
303
304
305
306
307

308
309
310
311
312
313
314
315
316
317
318
319
320

321
322
323
324
325
326
327
328
329
330
331
332
333
334
335

336
337
338
339
340
341
342
343
344
345
346
347
348

349
350
351
352

353
354

355
356
357
358
359
360






361

362
363
364
365
366
367








368
369
370
371
372


373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389


390
391
392
393
394
395
396
397

398
399
400
401
402
403
404

405
406

407
408
409

410
411
412
413
414

415
416
417
418
419
420
421

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
309
310
311
312
313
314
315

316
317
318
319
320
321
322
323
324
325
326
327


328
329
330
331

332


333
334
335
336
337


338
339
340
341
342
343
344
345






346
347
348
349
350
351
352
353
354
355
356


357
358
359
360
361
362













363
364
365
366
367
368
369
370
371

372
373
374
375
376
377
378

379
380

381
382
383

384
385
386
387
388

389
390
391
392
393
394
395
396








-
-
+












-
+














-
+











-
-
+



-
+
-
-
+




-
-
+
+
+
+
+
+

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



-
-
+
+




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







-
+






-
+

-
+


-
+




-
+








	objc_autoreleasePoolPop(pool);

	[ret makeImmutable];

	return ret;
}

- (void)setStringValue: (OFString *)stringValue
		forKey: (OFString *)key
- (void)setString: (OFString *)string forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();
	OFINICategoryPair *pair;

	for (id line in _lines) {
		if (![line isKindOfClass: [OFINICategoryPair class]])
			continue;

		pair = line;

		if ([pair->_key isEqual: key]) {
			OFString *old = pair->_value;
			pair->_value = [stringValue copy];
			pair->_value = [string copy];
			[old release];

			objc_autoreleasePoolPop(pool);

			return;
		}
	}

	pair = [[[OFINICategoryPair alloc] init] autorelease];
	pair->_key = nil;
	pair->_value = nil;

	@try {
		pair->_key = [key copy];
		pair->_value = [stringValue copy];
		pair->_value = [string copy];
		[_lines addObject: pair];
	} @catch (id e) {
		[pair->_key release];
		[pair->_value release];

		@throw e;
	}

	objc_autoreleasePoolPop(pool);
}

- (void)setLongLongValue: (long long)longLongValue
		  forKey: (OFString *)key
- (void)setLongLong: (long long)longLong forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();

	[self setStringValue: [OFString stringWithFormat: @"%lld",
	[self setString: [OFString stringWithFormat: @"%lld", longLong]
							  longLongValue]
		      forKey: key];
		 forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setBoolValue: (bool)boolValue
	      forKey: (OFString *)key
- (void)setBool: (bool)bool_ forKey: (OFString *)key
{
	[self setString: (bool_ ? @"true" : @"false") forKey: key];
}

- (void)setFloat: (float)float_ forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();
	[self setStringValue: (boolValue ? @"true" : @"false")
		      forKey: key];
}

- (void)setFloatValue: (float)floatValue
	       forKey: (OFString *)key

	[self setString: [OFString stringWithFormat: @"%g", float_]
		 forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setDouble: (double)double_ forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();

	[self setStringValue: [OFString stringWithFormat: @"%g", floatValue]
		      forKey: key];
	[self setString: [OFString stringWithFormat: @"%g", double_]
		 forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setDoubleValue: (double)doubleValue
		forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();

	[self setStringValue: [OFString stringWithFormat: @"%g", doubleValue]
		      forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setStringValues: (OFArray OF_GENERIC(OFString *) *)stringValues
		 forKey: (OFString *)key
- (void)setStringArray: (OFArray OF_GENERIC(OFString *) *)array
		forKey: (OFString *)key
{
	void *pool;
	OFMutableArray *pairs;
	id const *lines;
	size_t count;
	bool replaced;

	if (stringValues.count == 0) {
	if (array.count == 0) {
		[self removeValueForKey: key];
		return;
	}

	pool = objc_autoreleasePoolPush();

	pairs = [OFMutableArray arrayWithCapacity: stringValues.count];
	pairs = [OFMutableArray arrayWithCapacity: array.count];

	for (OFString *stringValue in stringValues) {
	for (OFString *string in array) {
		OFINICategoryPair *pair;

		if (![stringValue isKindOfClass: [OFString class]])
		if (![string isKindOfClass: [OFString class]])
			@throw [OFInvalidArgumentException exception];

		pair = [[[OFINICategoryPair alloc] init] autorelease];
		pair->_key = [key copy];
		pair->_value = [stringValue copy];
		pair->_value = [string copy];

		[pairs addObject: pair];
	}

	lines = _lines.objects;
	count = _lines.count;
	replaced = false;
︙
433
434
435
436
437
438
439
440

441
442
443
444
445
446
447

408
409
410
411
412
413
414

415
416
417
418
419
420
421
422








-
+









			if (!replaced) {
				[_lines insertObjectsFromArray: pairs
						       atIndex: i];

				replaced = true;
				/* Continue after inserted pairs */
				i += stringValues.count - 1;
				i += array.count - 1;
			} else
				i--;	/* Continue at same position */

			lines = _lines.objects;
			count = _lines.count;

			continue;
︙
Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.015s