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

Revert/fix handling of -isEqualToString: for proxies and subclasses.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31018 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-07-22 06:06:39 +00:00
parent 6f7bc142f2
commit 37ae0eb8f1
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/NSString.m
View file

@ -653,7 +653,7 @@ handle_printf_atsign (FILE *stream,
return obj;
}
}
else if (GSObjCIsKindOf(self, GSStringClass) == YES)
else if ([self isKindOfClass: GSStringClass] == YES)
{
[NSException raise: NSInternalInconsistencyException
format: @"Called +allocWithZone: on private string class"];
@ -2158,14 +2158,9 @@ handle_printf_atsign (FILE *stream,
}
if (anObject != nil && GSObjCIsInstance(anObject) == YES)
{
Class c = object_getClass(anObject);
if (c != nil)
if ([anObject isKindOfClass: NSStringClass])
{
if (GSObjCIsKindOf(c, NSStringClass))
{
return [self isEqualToString: anObject];
}
return [self isEqualToString: anObject];
}
}
return NO;
@ -2180,12 +2175,6 @@ handle_printf_atsign (FILE *stream,
if ([self hash] != [aString hash])
return NO;
// Note: This is entirely wrong, stupid, and breaks the spirit of
// Objective-C. Unfortunately, it's What Apple Does, so we are stuck with
// it.
if ([aString isProxy] || ![aString isKindOfClass: [self class]])
return NO;
if (strCompNsNs(self, aString, 0, (NSRange){0, [self length]})
== NSOrderedSame)
return YES;