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

Merge branch 'master' into numerical_locale

Browse source
This commit is contained in:
rfm 2020-03-29 11:26:40 +01:00 • committed by GitHub
commit 81d70b37c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 172 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/GSAttributedString.m
View file

@ -683,7 +683,8 @@ SANITY();
unsigned tmpLength;
unsigned arrayIndex = 0;
unsigned arraySize;
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
// Initial value unused; set by _attributesAtIndexEffectiveRange
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
unsigned afterRangeLoc, beginRangeLoc;
NSDictionary *attrs;
NSZone *z = [self zone];
@ -795,7 +796,8 @@ SANITY();
unsigned tmpLength;
unsigned arrayIndex = 0;
unsigned arraySize;
NSRange effectiveRange = NSMakeRange(0, NSNotFound);
// Initial value unused; set by _attributesAtIndexEffectiveRange
NSRange effectiveRange = NSMakeRange(NSNotFound, 0);
GSAttrInfo *info;
int moveLocations;
unsigned start;

14
Source/NSError.m
View file

@ -46,14 +46,14 @@ NSString* const NSRecoveryAttempterErrorKey
NSString* const NSURLErrorFailingURLErrorKey = @"NSErrorFailingURLKey";
NSString* const NSURLErrorFailingURLStringErrorKey = @"NSErrorFailingURLStringKey";
NSString* const NSMACHErrorDomain = @"NSMACHErrorDomain";
NSString* const NSOSStatusErrorDomain = @"NSOSStatusErrorDomain";
NSString* const NSPOSIXErrorDomain = @"NSPOSIXErrorDomain";
NSString* const NSCocoaErrorDomain = @"NSCocoaErrorDomain";
NSErrorDomain const NSMACHErrorDomain = @"NSMACHErrorDomain";
NSErrorDomain const NSOSStatusErrorDomain = @"NSOSStatusErrorDomain";
NSErrorDomain const NSPOSIXErrorDomain = @"NSPOSIXErrorDomain";
NSErrorDomain const NSCocoaErrorDomain = @"NSCocoaErrorDomain";
@implementation NSError
+ (id) errorWithDomain: (NSString*)aDomain
+ (id) errorWithDomain: (NSErrorDomain)aDomain
code: (NSInteger)aCode
userInfo: (NSDictionary*)aDictionary
{
@ -88,7 +88,7 @@ NSString* const NSCocoaErrorDomain = @"NSCocoaErrorDomain";
return [self localizedDescription];
}
- (NSString*) domain
- (NSErrorDomain) domain
{
return _domain;
}
@ -136,7 +136,7 @@ NSString* const NSCocoaErrorDomain = @"NSCocoaErrorDomain";
return self;
}
- (id) initWithDomain: (NSString*)aDomain
- (id) initWithDomain: (NSErrorDomain)aDomain
code: (NSInteger)aCode
userInfo: (NSDictionary*)aDictionary
{

35
Source/NSLocale.m
View file

@ -868,6 +868,41 @@ static NSRecursiveLock *classLock = nil;
return result;
}
- (NSString *) languageCode
{
return [self objectForKey: NSLocaleLanguageCode];
}
- (NSString *) countryCode
{
return [self objectForKey: NSLocaleLanguageCode];
}
- (NSString *) scriptCode
{
return [self objectForKey: NSLocaleScriptCode];
}
- (NSString *) variantCode
{
return [self objectForKey: NSLocaleVariantCode];
}
- (NSCharacterSet *) exemplarCharacterSet
{
return [self objectForKey: NSLocaleExemplarCharacterSet];
}
- (NSString *) collationIdentifier
{
return [self objectForKey: NSLocaleCollationIdentifier];
}
- (NSString *) collatorIdentifier
{
return [self objectForKey: NSLocaleCollatorIdentifier];
}
- (NSString *) description
{
return _localeId;

35
Source/NSURL.m
View file

@ -667,7 +667,7 @@ static NSUInteger urlAlign;
isDirectory: isDir]);
}
+ (NSURL*) fileURLWithPathComponents: (NSArray*)components
+ (id) fileURLWithPathComponents: (NSArray*)components
{
return [self fileURLWithPath: [NSString pathWithComponents: components]];
}
@ -2236,6 +2236,15 @@ static NSUInteger urlAlign;
if (self != nil)
{
GS_CREATE_INTERNAL(NSURLComponents);
internal->_rangeOfFragment = NSMakeRange(NSNotFound, 0);
internal->_rangeOfHost = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPassword = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPath = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPort = NSMakeRange(NSNotFound, 0);
internal->_rangeOfQuery = NSMakeRange(NSNotFound, 0);
internal->_rangeOfScheme = NSMakeRange(NSNotFound, 0);
internal->_rangeOfUser = NSMakeRange(NSNotFound, 0);
}
return self;
}
@ -2351,15 +2360,21 @@ static NSUInteger urlAlign;
[[url user] stringByAddingPercentEncodingWithAllowedCharacters:
[NSCharacterSet URLUserAllowedCharacterSet]]];
// Find ranges
internal->_rangeOfFragment = [[url absoluteString] rangeOfString: internal->_fragment];
internal->_rangeOfHost = [[url absoluteString] rangeOfString: internal->_host];
internal->_rangeOfPassword = [[url absoluteString] rangeOfString: internal->_password];
internal->_rangeOfPath = [[url absoluteString] rangeOfString: internal->_path];
internal->_rangeOfPort = [[url absoluteString] rangeOfString: [internal->_port stringValue]];
internal->_rangeOfQuery = [[url absoluteString] rangeOfString: internal->_query];
internal->_rangeOfScheme = [[url absoluteString] rangeOfString: internal->_scheme];
internal->_rangeOfUser = [[url absoluteString] rangeOfString: internal->_user];
{
// Find ranges
NSString *urlString = [url absoluteString];
#define URL_COMPONENT_RANGE(part) \
(part ? [urlString rangeOfString:part] : NSMakeRange(NSNotFound, 0))
internal->_rangeOfFragment = URL_COMPONENT_RANGE(internal->_fragment);
internal->_rangeOfHost = URL_COMPONENT_RANGE(internal->_host);
internal->_rangeOfPassword = URL_COMPONENT_RANGE(internal->_password);
internal->_rangeOfPath = URL_COMPONENT_RANGE(internal->_path);
internal->_rangeOfPort = URL_COMPONENT_RANGE([internal->_port stringValue]);
internal->_rangeOfQuery = URL_COMPONENT_RANGE(internal->_query);
internal->_rangeOfScheme = URL_COMPONENT_RANGE(internal->_scheme);
internal->_rangeOfUser = URL_COMPONENT_RANGE(internal->_user);
#undef URL_COMPONENT_RANGE
}
}
- (NSURL *)URLRelativeToURL: (NSURL *)baseURL