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

NSString rewrite/reorganisation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@7769 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-10-09 04:41:18 +00:00
parent 9882ff6686
commit b1d5d768fb
21 changed files with 451 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/NSGCString.m
View file

@ -114,7 +114,7 @@ static IMP msInitImp; /* designated initialiser for mutable */
- (unsigned) hash
{
if (_hash == 0)
_hash = _fastImp._NSString_hash(self, @selector(hash));
_hash = [super hash];
return _hash;
}
@ -483,10 +483,8 @@ static IMP msInitImp; /* designated initialiser for mutable */
if (_count != other->_count)
return NO;
if (_hash == 0)
_hash = _fastImp._NSString_hash(self, @selector(hash));
if (other->_hash == 0)
other->_hash = _fastImp._NSString_hash(other, @selector(hash));
if (_hash != other->_hash)
_hash = [super hash];
if (_hash != [other hash])
return NO;
if (memcmp(_contents_chars, other->_contents_chars, _count) != 0)
return NO;
@ -511,8 +509,7 @@ static IMP msInitImp; /* designated initialiser for mutable */
else if (c == nil)
return NO;
else if (fastClassIsKindOfClass(c, _fastCls._NSString))
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), anObject);
return [super isEqualtoString: anObject];
else
return NO;
}
@ -533,10 +530,8 @@ static IMP msInitImp; /* designated initialiser for mutable */
if (_count != other->_count)
return NO;
if (_hash == 0)
_hash = _fastImp._NSString_hash(self, @selector(hash));
if (other->_hash == 0)
other->_hash = _fastImp._NSString_hash(other, @selector(hash));
if (_hash != other->_hash)
_hash = [super hash];
if (_hash != [other hash])
return NO;
if (memcmp(_contents_chars, other->_contents_chars, _count) != 0)
return NO;
@ -561,8 +556,7 @@ static IMP msInitImp; /* designated initialiser for mutable */
else if (c == nil)
return NO;
else if (fastClassIsKindOfClass(c, _fastCls._NSString))
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), aString);
return [super isEqualToString: aString];
else
return NO;
}
@ -1432,8 +1426,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
}
else if (fastClassIsKindOfClass(c, _fastCls._NSString))
{
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), anObject);
return [anObject isEqualToString: self];
}
else
{
@ -1477,8 +1470,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
}
else if (fastClassIsKindOfClass(c, _fastCls._NSString))
{
return _fastImp._NSString_isEqualToString_(self,
@selector(isEqualToString:), aString);
return [anObject isEqualToString: self];
}
else
{