gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

tweak for fast conversion of literals to ascii or latin1

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33988 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-10-14 13:45:52 +00:00
parent 0f17556fc3
commit d14298591a
1 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Source/GSString.m
View file

@ -4735,10 +4735,11 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
* sets the ascii flag according to the content found. * sets the ascii flag according to the content found.
*/ */
static NSUInteger static NSUInteger
lengthUTF8(const uint8_t *p, unsigned l, BOOL *ascii) lengthUTF8(const uint8_t *p, unsigned l, BOOL *ascii, BOOL *latin1)
{ {
const uint8_t *e = p + l; const uint8_t *e = p + l;
BOOL a = YES; BOOL a = YES;
BOOL l1 = YES;
l = 0; l = 0;
while (p < e) while (p < e)
@ -4815,6 +4816,10 @@ lengthUTF8(const uint8_t *p, unsigned l, BOOL *ascii)
if (u < 0x10000) if (u < 0x10000)
{ {
l++; l++;
if (u > 255)
{
l1 = NO;
}
} }
else else
{ {
@ -4825,6 +4830,10 @@ lengthUTF8(const uint8_t *p, unsigned l, BOOL *ascii)
{ {
*ascii = a; *ascii = a;
} }
if (0 != latin1)
{
*latin1 = l1;
}
return l; return l;
} }
@ -4996,10 +5005,48 @@ nextUTF8(const uint8_t *p, unsigned l, unsigned *o, unichar *n)
} }
if (NSUTF8StringEncoding == encoding) if (NSUTF8StringEncoding == encoding)
{ {
/* We want utf-8, so we can just return an object pointing to the
* constant string data.
*/
return [NSDataClass dataWithBytesNoCopy: (void*)nxcsptr return [NSDataClass dataWithBytesNoCopy: (void*)nxcsptr
length: nxcslen length: nxcslen
freeWhenDone: NO]; freeWhenDone: NO];
} }
if (NSASCIIStringEncoding == encoding
|| NSISOLatin1StringEncoding == encoding)
{
BOOL ascii;
BOOL latin1;
unsigned length;
length = lengthUTF8((const uint8_t*)nxcsptr, nxcslen, &ascii, &latin1);
if (YES == ascii)
{
/* The coonstant string data is just ascii, so we can return a
* pointer to it dierctly.
*/
return [NSDataClass dataWithBytesNoCopy: (void*)nxcsptr
length: nxcslen
freeWhenDone: NO];
}
if (YES == latin1)
{
unsigned i = 0;
unichar n = 0;
uint8_t *b;
/* If all the characters are latin1 we can copy them efficiently.
*/
b = NSAllocateCollectable(length, 0);
while (i < length)
{
b[i] = nextUTF8((const uint8_t *)nxcsptr, nxcslen, &i, &n);
}
return [NSDataClass dataWithBytesNoCopy: (void*)b
length: length
freeWhenDone: YES];
}
}
return [super dataUsingEncoding: encoding allowLossyConversion: flag]; return [super dataUsingEncoding: encoding allowLossyConversion: flag];
} }
@ -5096,7 +5143,7 @@ nextUTF8(const uint8_t *p, unsigned l, unsigned *o, unichar *n)
- (NSUInteger) length - (NSUInteger) length
{ {
return lengthUTF8((const uint8_t*)nxcsptr, nxcslen, 0); return lengthUTF8((const uint8_t*)nxcsptr, nxcslen, 0, 0);
} }
- (NSRange) rangeOfCharacterFromSet: (NSCharacterSet*)aSet - (NSRange) rangeOfCharacterFromSet: (NSCharacterSet*)aSet
@ -5112,7 +5159,7 @@ nextUTF8(const uint8_t *p, unsigned l, unsigned *o, unichar *n)
unsigned i = 0; unsigned i = 0;
BOOL ascii; BOOL ascii;
index = lengthUTF8((const uint8_t*)nxcsptr, nxcslen, &ascii); index = lengthUTF8((const uint8_t*)nxcsptr, nxcslen, &ascii, 0);
GS_RANGE_CHECK(aRange, index); GS_RANGE_CHECK(aRange, index);
start = aRange.location; start = aRange.location;