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

Remove stupid OSX compatibility hack ... no longer needed.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35692 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-10-15 14:37:31 +00:00
parent e9d41fe2db
commit 9eb4770f5a
3 changed files with 67 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-10-15 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSCharacterSet.h:
* Source/NSCharacterSet.m:
For a long time Apple's docs and headers said that the methods for
returning standard charactersets returned 'NSCharacterSet*', which
was annoying when they were called on NSMutableCharacterSet.
It seems they finally changed to returning id, so we can do the same.
2012-10-12 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/NSDebug+GNUstepBase.h:

38
Headers/Foundation/NSCharacterSet.h
View file

@ -46,76 +46,76 @@ extern "C" {
* marks. Note that "letters" includes all alphabetic as well as Chinese
* characters, etc..
*/
+ (NSCharacterSet*) alphanumericCharacterSet;
+ (id) alphanumericCharacterSet;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/**
* Returns a character set containing letters in the unicode
* Titlecase category.
*/
+ (NSCharacterSet*) capitalizedLetterCharacterSet;
+ (id) capitalizedLetterCharacterSet;
#endif
/**
* Returns a character set containing control and format characters.
*/
+ (NSCharacterSet*) controlCharacterSet;
+ (id) controlCharacterSet;
/**
* Returns a character set containing characters that represent
* the decimal digits 0 through 9.
*/
+ (NSCharacterSet*) decimalDigitCharacterSet;
+ (id) decimalDigitCharacterSet;
/**
* Returns a character set containing individual characters that
* can be represented also by a composed character sequence.
*/
+ (NSCharacterSet*) decomposableCharacterSet;
+ (id) decomposableCharacterSet;
/**
* Returns a character set containing unassigned and explicitly illegal
* character values.
*/
+ (NSCharacterSet*) illegalCharacterSet;
+ (id) illegalCharacterSet;
/**
* Returns a character set containing letters, including all alphabetic as
* well as Chinese characters, etc..
*/
+ (NSCharacterSet*) letterCharacterSet;
+ (id) letterCharacterSet;
/**
* Returns a character set that contains the lowercase characters.
* This set does not include caseless characters, only those that
* have corresponding characters in uppercase and/or titlecase.
*/
+ (NSCharacterSet*) lowercaseLetterCharacterSet;
+ (id) lowercaseLetterCharacterSet;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/**
* Returns a character set containing the newline characters, values
* 0x000A and 0x000D and nextline 0x0085 character.
*/
+ (NSCharacterSet*) newlineCharacterSet;
+ (id) newlineCharacterSet;
#endif
/**
* Returns a character set containing characters for diacritical marks, which
* are usually only rendered in conjunction with another character.
*/
+ (NSCharacterSet*) nonBaseCharacterSet;
+ (id) nonBaseCharacterSet;
/**
* Returns a character set containing punctuation marks.
*/
+ (NSCharacterSet*) punctuationCharacterSet;
+ (id) punctuationCharacterSet;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/**
* Returns a character set containing mathematical symbols, etc..
*/
+ (NSCharacterSet*) symbolCharacterSet;
+ (id) symbolCharacterSet;
#endif
/**
@ -123,36 +123,36 @@ extern "C" {
* This set does not include caseless characters, only those that
* have corresponding characters in lowercase and/or titlecase.
*/
+ (NSCharacterSet*) uppercaseLetterCharacterSet;
+ (id) uppercaseLetterCharacterSet;
/**
* Returns a character set that contains the whitespace characters,
* plus the newline characters, values 0x000A and 0x000D and nextline
* 0x0085 character.
*/
+ (NSCharacterSet*) whitespaceAndNewlineCharacterSet;
+ (id) whitespaceAndNewlineCharacterSet;
/**
* Returns a character set that contains the whitespace characters.
*/
+ (NSCharacterSet*) whitespaceCharacterSet;
+ (id) whitespaceCharacterSet;
/**
* Returns a character set containing characters as encoded in the
* data object (8192 bytes)
*/
+ (NSCharacterSet*) characterSetWithBitmapRepresentation: (NSData*)data;
+ (id) characterSetWithBitmapRepresentation: (NSData*)data;
/**
* Returns set with characters in aString, or empty set for empty string.
* Raises an exception if given a nil string.
*/
+ (NSCharacterSet*) characterSetWithCharactersInString: (NSString*)aString;
+ (id) characterSetWithCharactersInString: (NSString*)aString;
/**
* Returns set containing unicode index range given by aRange.
*/
+ (NSCharacterSet*) characterSetWithRange: (NSRange)aRange;
+ (id) characterSetWithRange: (NSRange)aRange;
#if OS_API_VERSION(GS_API_OPENSTEP, GS_API_MACOSX)
/**
@ -163,7 +163,7 @@ extern "C" {
* To get around this load the file into data yourself and use
* [NSCharacterSet -characterSetWithBitmapRepresentation].
*/
+ (NSCharacterSet*) characterSetWithContentsOfFile: (NSString*)aFile;
+ (id) characterSetWithContentsOfFile: (NSString*)aFile;
#endif
/**

78
Source/NSCharacterSet.m
View file

@ -680,84 +680,84 @@ static Class concreteMutableClass = nil;
return cache_set[number];
}
+ (NSCharacterSet*) alphanumericCharacterSet
+ (id) alphanumericCharacterSet
{
return [self _staticSet: alphanumericCharSet
length: sizeof(alphanumericCharSet)
number: 0];
}
+ (NSCharacterSet*) capitalizedLetterCharacterSet
+ (id) capitalizedLetterCharacterSet
{
return [self _staticSet: titlecaseLetterCharSet
length: sizeof(titlecaseLetterCharSet)
number: 13];
}
+ (NSCharacterSet*) controlCharacterSet
+ (id) controlCharacterSet
{
return [self _staticSet: controlCharSet
length: sizeof(controlCharSet)
number: 1];
}
+ (NSCharacterSet*) decimalDigitCharacterSet
+ (id) decimalDigitCharacterSet
{
return [self _staticSet: decimalDigitCharSet
length: sizeof(decimalDigitCharSet)
number: 2];
}
+ (NSCharacterSet*) decomposableCharacterSet
+ (id) decomposableCharacterSet
{
return [self _staticSet: decomposableCharSet
length: sizeof(decomposableCharSet)
number: 3];
}
+ (NSCharacterSet*) illegalCharacterSet
+ (id) illegalCharacterSet
{
return [self _staticSet: illegalCharSet
length: sizeof(illegalCharSet)
number: 4];
}
+ (NSCharacterSet*) letterCharacterSet
+ (id) letterCharacterSet
{
return [self _staticSet: letterCharSet
length: sizeof(letterCharSet)
number: 5];
}
+ (NSCharacterSet*) lowercaseLetterCharacterSet
+ (id) lowercaseLetterCharacterSet
{
return [self _staticSet: lowercaseLetterCharSet
length: sizeof(lowercaseLetterCharSet)
number: 6];
}
+ (NSCharacterSet*) newlineCharacterSet
+ (id) newlineCharacterSet
{
return [self _staticSet: newlineCharSet
length: sizeof(newlineCharSet)
number: 14];
}
+ (NSCharacterSet*) nonBaseCharacterSet
+ (id) nonBaseCharacterSet
{
return [self _staticSet: nonBaseCharSet
length: sizeof(nonBaseCharSet)
number: 7];
}
+ (NSCharacterSet*) punctuationCharacterSet
+ (id) punctuationCharacterSet
{
return [self _staticSet: punctuationCharSet
length: sizeof(punctuationCharSet)
number: 8];
}
+ (NSCharacterSet*) symbolCharacterSet
+ (id) symbolCharacterSet
{
return [self _staticSet: symbolAndOperatorCharSet
length: sizeof(symbolAndOperatorCharSet)
@ -765,7 +765,7 @@ static Class concreteMutableClass = nil;
}
// FIXME ... deprecated ... remove after next release.
+ (NSCharacterSet*) symbolAndOperatorCharacterSet
+ (id) symbolAndOperatorCharacterSet
{
GSOnceMLog(@"symbolAndOperatorCharacterSet is deprecated ... use symbolCharacterSet");
return [self _staticSet: symbolAndOperatorCharSet
@ -773,33 +773,33 @@ static Class concreteMutableClass = nil;
number: 9];
}
+ (NSCharacterSet*) uppercaseLetterCharacterSet
+ (id) uppercaseLetterCharacterSet
{
return [self _staticSet: uppercaseLetterCharSet
length: sizeof(uppercaseLetterCharSet)
number: 10];
}
+ (NSCharacterSet*) whitespaceAndNewlineCharacterSet
+ (id) whitespaceAndNewlineCharacterSet
{
return [self _staticSet: whitespaceAndNlCharSet
length: sizeof(whitespaceAndNlCharSet)
number: 11];
}
+ (NSCharacterSet*) whitespaceCharacterSet
+ (id) whitespaceCharacterSet
{
return [self _staticSet: whitespaceCharSet
length: sizeof(whitespaceCharSet)
number: 12];
}
+ (NSCharacterSet*) characterSetWithBitmapRepresentation: (NSData*)data
+ (id) characterSetWithBitmapRepresentation: (NSData*)data
{
return AUTORELEASE([[concreteClass alloc] initWithBitmap: data]);
}
+ (NSCharacterSet*) characterSetWithCharactersInString: (NSString*)aString
+ (id) characterSetWithCharactersInString: (NSString*)aString
{
NSMutableCharacterSet *ms;
NSCharacterSet *cs;
@ -811,7 +811,7 @@ static Class concreteMutableClass = nil;
return AUTORELEASE(cs);
}
+ (NSCharacterSet*) characterSetWithRange: (NSRange)aRange
+ (id) characterSetWithRange: (NSRange)aRange
{
NSMutableCharacterSet *ms;
NSCharacterSet *cs;
@ -823,7 +823,7 @@ static Class concreteMutableClass = nil;
return AUTORELEASE(cs);
}
+ (NSCharacterSet*) characterSetWithContentsOfFile: (NSString*)aFile
+ (id) characterSetWithContentsOfFile: (NSString*)aFile
{
if ([@"bitmap" isEqual: [aFile pathExtension]])
{
@ -1033,93 +1033,93 @@ static Class concreteMutableClass = nil;
@implementation NSMutableCharacterSet
/* Override this from NSCharacterSet to create the correct class */
+ (NSCharacterSet*) characterSetWithBitmapRepresentation: (NSData*)data
+ (id) characterSetWithBitmapRepresentation: (NSData*)data
{
return AUTORELEASE([[concreteMutableClass alloc] initWithBitmap: data]);
}
+ (NSCharacterSet*) alphanumericCharacterSet
+ (id) alphanumericCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) capitalizedLetterCharacterSet
+ (id) capitalizedLetterCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) controlCharacterSet
+ (id) controlCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) decimalDigitCharacterSet
+ (id) decimalDigitCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) decomposableCharacterSet
+ (id) decomposableCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) illegalCharacterSet
+ (id) illegalCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) letterCharacterSet
+ (id) letterCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) lowercaseLetterCharacterSet
+ (id) lowercaseLetterCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) newlineCharacterSet
+ (id) newlineCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) nonBaseCharacterSet
+ (id) nonBaseCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) punctuationCharacterSet
+ (id) punctuationCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) symbolCharacterSet
+ (id) symbolCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
// FIXME ... deprecated ... remove after next release.
+ (NSCharacterSet*) symbolAndOperatorCharacterSet
+ (id) symbolAndOperatorCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) uppercaseLetterCharacterSet
+ (id) uppercaseLetterCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) whitespaceAndNewlineCharacterSet
+ (id) whitespaceAndNewlineCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) whitespaceCharacterSet
+ (id) whitespaceCharacterSet
{
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
}
+ (NSCharacterSet*) characterSetWithCharactersInString: (NSString*)aString
+ (id) characterSetWithCharactersInString: (NSString*)aString
{
NSMutableCharacterSet *ms;
@ -1128,7 +1128,7 @@ static Class concreteMutableClass = nil;
return AUTORELEASE(ms);
}
+ (NSCharacterSet*) characterSetWithRange: (NSRange)aRange
+ (id) characterSetWithRange: (NSRange)aRange
{
NSMutableCharacterSet *ms;