gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix ordering of initialisation of constant string class.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14632 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-10-02 13:29:54 +00:00
parent 43385f8be9
commit 80de3c6a30
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/GSString.m
View file

@ -255,7 +255,7 @@ setup()
GSCSubStringClass = [GSCSubString class]; GSCSubStringClass = [GSCSubString class];
GSUnicodeSubStringClass = [GSUnicodeSubString class]; GSUnicodeSubStringClass = [GSUnicodeSubString class];
GSMutableStringClass = [GSMutableString class]; GSMutableStringClass = [GSMutableString class];
NSConstantStringClass = [NSString constantStringClass]; NSConstantStringClass = [NXConstantString class];
/* /*
* Cache some selectors and method implementations for * Cache some selectors and method implementations for
@ -3508,6 +3508,7 @@ transmute(ivars self, NSString *aString)
if (self == [NXConstantString class]) if (self == [NXConstantString class])
{ {
behavior_class_add_class(self, [GSCString class]); behavior_class_add_class(self, [GSCString class]);
NSConstantStringClass = self;
} }
} }

9
Source/NSString.m
View file

@ -376,7 +376,6 @@ handle_printf_atsign (FILE *stream,
NSStringClass = self; NSStringClass = self;
[self setVersion: 1]; [self setVersion: 1];
NSMutableStringClass = [NSMutableString class]; NSMutableStringClass = [NSMutableString class];
NSConstantStringClass = [NXConstantString class];
NSDataClass = [NSData class]; NSDataClass = [NSData class];
GSPlaceholderStringClass = [GSPlaceholderString class]; GSPlaceholderStringClass = [GSPlaceholderString class];
GSStringClass = [GSString class]; GSStringClass = [GSString class];
@ -462,8 +461,16 @@ handle_printf_atsign (FILE *stream,
} }
} }
/**
* Return the class used to dtore constant strings (those ascii strings
* placed in ythe source code using the @"this is a string" syntax.
*/
+ (Class) constantStringClass + (Class) constantStringClass
{ {
if (NSConstantStringClass == 0)
{
NSConstantStringClass = [NXConstantString class];
}
return NSConstantStringClass; return NSConstantStringClass;
} }