Differences From Artifact [4f19bc623c]:
- File src/OFString.m — part of check-in [813c00ccf0] at 2013-01-09 22:24:47 on branch trunk — Update copyright. (user: js, size: 49457) [annotate] [blame] [check-ins using]
To Artifact [5a8a220443]:
- File
src/OFString.m
— part of check-in
[50916b8dbe]
at
2013-01-11 12:41:54
on branch trunk
— OFString: Improve API for characters / UTF-32.
With this change, there is a clear separation between characters and
UTF-32 strings now. Characters are just an array of characters in the
native endianess, with no BOM prepended. UTF-32 on the other hand may
have a BOM and can be swapped and is optionally zero-terminated.This also fixes a few missing UTF-16 init methods in OFMutableString. (user: js, size: 50023) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
310 311 312 313 314 315 316 |
- initWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithCharacters: string
length: length];
}
| < < < < < < < < < | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 |
- initWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithCharacters: string
length: length];
}
- initWithUTF16String: (const uint16_t*)string
{
return (id)[[OFString_UTF8 alloc] initWithUTF16String: string];
}
- initWithUTF16String: (const uint16_t*)string
length: (size_t)length
|
| ︙ | ︙ | |||
353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 |
- initWithUTF32String: (const uint32_t*)string
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string];
}
- initWithUTF32String: (const uint32_t*)string
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
byteOrder: byteOrder];
}
- initWithFormat: (OFConstantString*)format, ...
{
id ret;
va_list arguments;
| > > > > > > > > > > > > > > > > | 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 |
- initWithUTF32String: (const uint32_t*)string
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string];
}
- initWithUTF32String: (const uint32_t*)string
length: (size_t)length
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
length: length];
}
- initWithUTF32String: (const uint32_t*)string
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
byteOrder: byteOrder];
}
- initWithUTF32String: (const uint32_t*)string
length: (size_t)length
byteOrder: (of_byte_order_t)byteOrder
{
return (id)[[OFString_UTF8 alloc] initWithUTF32String: string
length: length
byteOrder: byteOrder];
}
- initWithFormat: (OFConstantString*)format, ...
{
id ret;
va_list arguments;
|
| ︙ | ︙ | |||
521 522 523 524 525 526 527 |
+ (instancetype)stringWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
return [[[self alloc] initWithCharacters: string
length: length] autorelease];
}
| < < < < < < < < < | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 |
+ (instancetype)stringWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
return [[[self alloc] initWithCharacters: string
length: length] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
{
return [[[self alloc] initWithUTF16String: string] autorelease];
}
+ (instancetype)stringWithUTF16String: (const uint16_t*)string
length: (size_t)length
|
| ︙ | ︙ | |||
564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 |
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
{
return [[[self alloc] initWithUTF32String: string] autorelease];
}
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
byteOrder: (of_byte_order_t)byteOrder
{
return [[[self alloc] initWithUTF32String: string
byteOrder: byteOrder] autorelease];
}
+ (instancetype)stringWithFormat: (OFConstantString*)format, ...
{
id ret;
va_list arguments;
| > > > > > > > > > > > > > > > > | 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 |
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
{
return [[[self alloc] initWithUTF32String: string] autorelease];
}
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
length: (size_t)length
{
return [[[self alloc] initWithUTF32String: string
length: length] autorelease];
}
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
byteOrder: (of_byte_order_t)byteOrder
{
return [[[self alloc] initWithUTF32String: string
byteOrder: byteOrder] autorelease];
}
+ (instancetype)stringWithUTF32String: (const uint32_t*)string
length: (size_t)length
byteOrder: (of_byte_order_t)byteOrder
{
return [[[self alloc] initWithUTF32String: string
length: length
byteOrder: byteOrder] autorelease];
}
+ (instancetype)stringWithFormat: (OFConstantString*)format, ...
{
id ret;
va_list arguments;
|
| ︙ | ︙ | |||
691 692 693 694 695 696 697 |
@throw e;
}
}
- initWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
| < < < < < < < < < | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 |
@throw e;
}
}
- initWithCharacters: (const of_unichar_t*)string
length: (size_t)length
{
@try {
[self doesNotRecognizeSelector: _cmd];
abort();
} @catch (id e) {
[self release];
@throw e;
}
|
| ︙ | ︙ | |||
747 748 749 750 751 752 753 |
[self release];
@throw e;
}
}
- initWithUTF32String: (const uint32_t*)string
{
| | | | > > > > > > > > > > > > > > > > > > > > > | < < > > | 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 |
[self release];
@throw e;
}
}
- initWithUTF32String: (const uint32_t*)string
{
return [self initWithUTF32String: string
length: of_string_utf32_length(string)
byteOrder: OF_BYTE_ORDER_NATIVE];
}
- initWithUTF32String: (const uint32_t*)string
length: (size_t)length
{
return [self initWithUTF32String: string
length: length
byteOrder: OF_BYTE_ORDER_NATIVE];
}
- initWithUTF32String: (const uint32_t*)string
byteOrder: (of_byte_order_t)byteOrder
{
return [self initWithUTF32String: string
length: of_string_utf32_length(string)
byteOrder: byteOrder];
}
- initWithUTF32String: (const uint32_t*)string
length: (size_t)length
byteOrder: (of_byte_order_t)byteOrder
{
@try {
[self doesNotRecognizeSelector: _cmd];
abort();
} @catch (id e) {
[self release];
@throw e;
}
}
- initWithFormat: (OFConstantString*)format, ...
{
id ret;
va_list arguments;
|
| ︙ | ︙ |