Skip to content

Commit 04c1c11

Browse files
committed
define NSMutableCharacterSet return type for NSMutableCharacterSet class methods
1 parent a4bdcf0 commit 04c1c11

2 files changed

Lines changed: 31 additions & 25 deletions

File tree

Headers/Foundation/NSCharacterSet.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,12 @@ GS_EXPORT_CLASS
241241
GS_EXPORT_CLASS
242242
@interface NSMutableCharacterSet : NSCharacterSet
243243

244+
/**
245+
* Returns set with characters in aString, or empty set for empty string.
246+
* Raises an exception if given a nil string.
247+
*/
248+
+ (NSMutableCharacterSet*) characterSetWithCharactersInString: (NSString*)aString;
249+
244250
/**
245251
* Adds characters specified by unicode indices in aRange to set.
246252
*/

Source/NSCharacterSet.m

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,123 +1182,123 @@ - (id) mutableCopyWithZone: (NSZone*)zone
11821182
@implementation NSMutableCharacterSet
11831183

11841184
/* Override this from NSCharacterSet to create the correct class */
1185-
+ (NSCharacterSet*) characterSetWithBitmapRepresentation: (NSData*)data
1185+
+ (NSMutableCharacterSet*) characterSetWithBitmapRepresentation: (NSData*)data
11861186
{
11871187
return AUTORELEASE([[concreteMutableClass alloc] initWithBitmap: data]);
11881188
}
11891189

1190-
+ (NSCharacterSet*) alphanumericCharacterSet
1190+
+ (NSMutableCharacterSet*) alphanumericCharacterSet
11911191
{
11921192
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
11931193
}
11941194

1195-
+ (NSCharacterSet*) capitalizedLetterCharacterSet
1195+
+ (NSMutableCharacterSet*) capitalizedLetterCharacterSet
11961196
{
11971197
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
11981198
}
11991199

1200-
+ (NSCharacterSet*) controlCharacterSet
1200+
+ (NSMutableCharacterSet*) controlCharacterSet
12011201
{
12021202
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12031203
}
12041204

1205-
+ (NSCharacterSet*) decimalDigitCharacterSet
1205+
+ (NSMutableCharacterSet*) decimalDigitCharacterSet
12061206
{
12071207
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12081208
}
12091209

1210-
+ (NSCharacterSet*) decomposableCharacterSet
1210+
+ (NSMutableCharacterSet*) decomposableCharacterSet
12111211
{
12121212
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12131213
}
12141214

1215-
+ (NSCharacterSet*) illegalCharacterSet
1215+
+ (NSMutableCharacterSet*) illegalCharacterSet
12161216
{
12171217
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12181218
}
12191219

1220-
+ (NSCharacterSet*) letterCharacterSet
1220+
+ (NSMutableCharacterSet*) letterCharacterSet
12211221
{
12221222
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12231223
}
12241224

1225-
+ (NSCharacterSet*) lowercaseLetterCharacterSet
1225+
+ (NSMutableCharacterSet*) lowercaseLetterCharacterSet
12261226
{
12271227
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12281228
}
12291229

1230-
+ (NSCharacterSet*) newlineCharacterSet
1230+
+ (NSMutableCharacterSet*) newlineCharacterSet
12311231
{
12321232
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12331233
}
12341234

1235-
+ (NSCharacterSet*) nonBaseCharacterSet
1235+
+ (NSMutableCharacterSet*) nonBaseCharacterSet
12361236
{
12371237
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12381238
}
12391239

1240-
+ (NSCharacterSet*) punctuationCharacterSet
1240+
+ (NSMutableCharacterSet*) punctuationCharacterSet
12411241
{
12421242
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12431243
}
12441244

1245-
+ (NSCharacterSet*) symbolCharacterSet
1245+
+ (NSMutableCharacterSet*) symbolCharacterSet
12461246
{
12471247
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12481248
}
12491249

12501250
// FIXME ... deprecated ... remove after next release.
1251-
+ (NSCharacterSet*) symbolAndOperatorCharacterSet
1251+
+ (NSMutableCharacterSet*) symbolAndOperatorCharacterSet
12521252
{
12531253
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12541254
}
12551255

1256-
+ (NSCharacterSet*) uppercaseLetterCharacterSet
1256+
+ (NSMutableCharacterSet*) uppercaseLetterCharacterSet
12571257
{
12581258
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12591259
}
12601260

1261-
+ (NSCharacterSet*) whitespaceAndNewlineCharacterSet
1261+
+ (NSMutableCharacterSet*) whitespaceAndNewlineCharacterSet
12621262
{
12631263
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12641264
}
12651265

1266-
+ (NSCharacterSet*) whitespaceCharacterSet
1266+
+ (NSMutableCharacterSet*) whitespaceCharacterSet
12671267
{
12681268
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12691269
}
12701270

1271-
+ (NSCharacterSet*) URLFragmentAllowedCharacterSet
1271+
+ (NSMutableCharacterSet*) URLFragmentAllowedCharacterSet
12721272
{
12731273
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12741274
}
12751275

1276-
+ (NSCharacterSet*) URLHostAllowedCharacterSet
1276+
+ (NSMutableCharacterSet*) URLHostAllowedCharacterSet
12771277
{
12781278
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12791279
}
12801280

1281-
+ (NSCharacterSet*) URLPasswordAllowedCharacterSet
1281+
+ (NSMutableCharacterSet*) URLPasswordAllowedCharacterSet
12821282
{
12831283
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12841284
}
12851285

1286-
+ (NSCharacterSet*) URLPathAllowedCharacterSet
1286+
+ (NSMutableCharacterSet*) URLPathAllowedCharacterSet
12871287
{
12881288
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12891289
}
12901290

1291-
+ (NSCharacterSet*) URLQueryAllowedCharacterSet
1291+
+ (NSMutableCharacterSet*) URLQueryAllowedCharacterSet
12921292
{
12931293
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12941294
}
12951295

1296-
+ (NSCharacterSet*) URLUserAllowedCharacterSet
1296+
+ (NSMutableCharacterSet*) URLUserAllowedCharacterSet
12971297
{
12981298
return AUTORELEASE([[abstractClass performSelector: _cmd] mutableCopy]);
12991299
}
13001300

1301-
+ (NSCharacterSet*) characterSetWithCharactersInString: (NSString*)aString
1301+
+ (NSMutableCharacterSet*) characterSetWithCharactersInString: (NSString*)aString
13021302
{
13031303
NSMutableCharacterSet *ms;
13041304

@@ -1307,7 +1307,7 @@ + (NSCharacterSet*) characterSetWithCharactersInString: (NSString*)aString
13071307
return AUTORELEASE(ms);
13081308
}
13091309

1310-
+ (NSCharacterSet*) characterSetWithRange: (NSRange)aRange
1310+
+ (NSMutableCharacterSet*) characterSetWithRange: (NSRange)aRange
13111311
{
13121312
NSMutableCharacterSet *ms;
13131313

0 commit comments

Comments
 (0)