gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some final tiny optimisations for testing string equality.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3045 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-10-09 04:24:56 +00:00
parent f57bb849fa
commit 7694a7f14e
7 changed files with 67 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/NSGString.m
View file

@ -57,8 +57,7 @@
- (unsigned) hash
{
if (_hash == 0)
if ((_hash = _fastImp._NSString_hash(self, @selector(hash))) == 0)
_hash = 0xffffffff;
_hash = _fastImp._NSString_hash(self, @selector(hash));
return _hash;
}
@ -70,20 +69,28 @@
if (anObject == nil)
return NO;
c = fastClassOfInstance(anObject);
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString)
if (c == _fastCls._NSGString || c == _fastCls._NSGMutableString ||
c == _fastCls._NSGCString || c == _fastCls._NSGMutableCString ||
c == _fastCls._NXConstantString)
{
NSGString *other = (NSGString*)anObject;
if (_hash == 0)
_fastImp._NSGString_hash(self, @selector(hash));
_hash = _fastImp._NSString_hash(self, @selector(hash));
if (other->_hash == 0)
_fastImp._NSGString_hash(other, @selector(hash));
other->_hash = _fastImp._NSString_hash(other, @selector(hash));
if (_hash != other->_hash)
return NO;
return [self isEqualToString: other];
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), other);
}
else if (c == nil)
return NO;
else if (fastClassIsKindOfClass(c, _fastCls._NSString))
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), anObject);
else
return [super isEqual: anObject];
return NO;
}
// Initializing Newly Allocated Strings
@ -231,7 +238,6 @@
- (void) encodeWithCoder: aCoder
{
[super encodeWithCoder:aCoder]; // *** added this
[aCoder encodeValueOfObjCType:@encode(int) at:&_count
withName:@"Concrete String count"];
[aCoder encodeArrayOfObjCType:@encode(unichar)
@ -242,7 +248,6 @@
- initWithCoder: aCoder
{
[super initWithCoder:aCoder];
[aCoder decodeValueOfObjCType:@encode(int) at:&_count
withName:NULL];
OBJC_MALLOC(_contents_chars, unichar, _count+1);