ObjFW  Diff

Differences From Artifact [e40123b4c3]:

To Artifact [299aa74c88]:


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
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







-
+






-
+







-
+







	return [self isEqual: object];
}

- (uint32_t)hash
{
	[self finishInitialization];

	return [self hash];
	return self.hash;
}

- (OFString *)description
{
	[self finishInitialization];

	return [self description];
	return self.description;
}

/* From OFString */
- (const char *)UTF8String
{
	[self finishInitialization];

	return [self UTF8String];
	return self.UTF8String;
}

- (size_t)getCString: (char *)cString_
	   maxLength: (size_t)maxLength
	    encoding: (of_string_encoding_t)encoding
{
	[self finishInitialization];
300
301
302
303
304
305
306
307

308
309
310
311
312
313
314

315
316
317
318
319
320
321
300
301
302
303
304
305
306

307
308
309
310
311
312
313

314
315
316
317
318
319
320
321







-
+






-
+







	return [self cStringWithEncoding: encoding];
}

- (size_t)length
{
	[self finishInitialization];

	return [self length];
	return self.length;
}

- (size_t)UTF8StringLength
{
	[self finishInitialization];

	return [self UTF8StringLength];
	return self.UTF8StringLength;
}

- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
{
	[self finishInitialization];

	return [self cStringLengthWithEncoding: encoding];
464
465
466
467
468
469
470
471

472
473
474
475
476
477
478

479
480
481
482
483
484
485

486
487
488
489
490
491
492

493
494
495
496
497
498
499

500
501
502
503
504
505
506

507
508
509
510
511
512
513
464
465
466
467
468
469
470

471
472
473
474
475
476
477

478
479
480
481
482
483
484

485
486
487
488
489
490
491

492
493
494
495
496
497
498

499
500
501
502
503
504
505

506
507
508
509
510
511
512
513







-
+






-
+






-
+






-
+






-
+






-
+







						    range: range];
}

- (OFString *)uppercaseString
{
	[self finishInitialization];

	return [self uppercaseString];
	return self.uppercaseString;
}

- (OFString *)lowercaseString
{
	[self finishInitialization];

	return [self lowercaseString];
	return self.lowercaseString;
}

- (OFString *)capitalizedString
{
	[self finishInitialization];

	return [self capitalizedString];
	return self.capitalizedString;
}

- (OFString *)stringByDeletingLeadingWhitespaces
{
	[self finishInitialization];

	return [self stringByDeletingLeadingWhitespaces];
	return self.stringByDeletingLeadingWhitespaces;
}

- (OFString *)stringByDeletingTrailingWhitespaces
{
	[self finishInitialization];

	return [self stringByDeletingTrailingWhitespaces];
	return self.stringByDeletingTrailingWhitespaces;
}

- (OFString *)stringByDeletingEnclosingWhitespaces
{
	[self finishInitialization];

	return [self stringByDeletingEnclosingWhitespaces];
	return self.stringByDeletingEnclosingWhitespaces;
}

- (bool)hasPrefix: (OFString *)prefix
{
	[self finishInitialization];

	return [self hasPrefix: prefix];
554
555
556
557
558
559
560
561

562
563
564
565
566
567
568

569
570
571
572
573
574
575

576
577
578
579
580
581
582

583
584
585
586
587
588
589

590
591
592
593
594
595
596

597
598
599
600
601
602
603

604
605
606
607
608
609
610

611
612
613
614
615
616
617

618
619
620
621
622
623
624

625
626
627
628
629
630
631
632
633
634
635
636
637
638

639
640
641
642
643
644
645

646
647
648
649
650
651
652
554
555
556
557
558
559
560

561
562
563
564
565
566
567

568
569
570
571
572
573
574

575
576
577
578
579
580
581

582
583
584
585
586
587
588

589
590
591
592
593
594
595

596
597
598
599
600
601
602

603
604
605
606
607
608
609

610
611
612
613
614
615
616

617
618
619
620
621
622
623

624
625
626
627
628
629
630
631
632
633
634
635
636
637

638
639
640
641
642
643
644

645
646
647
648
649
650
651
652







-
+






-
+






-
+






-
+






-
+






-
+






-
+






-
+






-
+






-
+













-
+






-
+







						  options: options];
}

- (OFArray *)pathComponents
{
	[self finishInitialization];

	return [self pathComponents];
	return self.pathComponents;
}

- (OFString *)lastPathComponent
{
	[self finishInitialization];

	return [self lastPathComponent];
	return self.lastPathComponent;
}

- (OFString *)stringByDeletingLastPathComponent
{
	[self finishInitialization];

	return [self stringByDeletingLastPathComponent];
	return self.stringByDeletingLastPathComponent;
}

- (intmax_t)decimalValue
{
	[self finishInitialization];

	return [self decimalValue];
	return self.decimalValue;
}

- (uintmax_t)hexadecimalValue
{
	[self finishInitialization];

	return [self hexadecimalValue];
	return self.hexadecimalValue;
}

- (uintmax_t)octalValue
{
	[self finishInitialization];

	return [self octalValue];
	return self.octalValue;
}

- (float)floatValue
{
	[self finishInitialization];

	return [self floatValue];
	return self.floatValue;
}

- (double)doubleValue
{
	[self finishInitialization];

	return [self doubleValue];
	return self.doubleValue;
}

- (const of_unichar_t *)characters
{
	[self finishInitialization];

	return [self characters];
	return self.characters;
}

- (const of_char16_t *)UTF16String
{
	[self finishInitialization];

	return [self UTF16String];
	return self.UTF16String;
}

- (const of_char16_t *)UTF16StringWithByteOrder: (of_byte_order_t)byteOrder
{
	[self finishInitialization];

	return [self UTF16StringWithByteOrder: byteOrder];
}

- (size_t)UTF16StringLength
{
	[self finishInitialization];

	return [self UTF16StringLength];
	return self.UTF16StringLength;
}

- (const of_char32_t *)UTF32String
{
	[self finishInitialization];

	return [self UTF32String];
	return self.UTF32String;
}

- (const of_char32_t *)UTF32StringWithByteOrder: (of_byte_order_t)byteOrder
{
	[self finishInitialization];

	return [self UTF32StringWithByteOrder: byteOrder];
660
661
662
663
664
665
666
667

668
669
670
671
672
673
674

675
676
677
678
679
680
681
660
661
662
663
664
665
666

667
668
669
670
671
672
673

674
675
676
677
678
679
680
681







-
+






-
+







}

#ifdef OF_HAVE_UNICODE_TABLES
- (OFString *)decomposedStringWithCanonicalMapping
{
	[self finishInitialization];

	return [self decomposedStringWithCanonicalMapping];
	return self.decomposedStringWithCanonicalMapping;
}

- (OFString *)decomposedStringWithCompatibilityMapping
{
	[self finishInitialization];

	return [self decomposedStringWithCompatibilityMapping];
	return self.decomposedStringWithCompatibilityMapping;
}
#endif

#ifdef OF_HAVE_FILES
- (void)writeToFile: (OFString *)path
{
	[self finishInitialization];