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

light tidying

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39568 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2016-03-20 11:53:01 +00:00
parent bc2927bd2d
commit 1ee226b495
2 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/NSLocale.m
View file

@ -853,11 +853,12 @@ static NSRecursiveLock *classLock = nil;
return _localeId; return _localeId;
} }
- (BOOL) isEqual: (id) obj - (BOOL) isEqual: (id)obj
{ {
if ([obj isKindOfClass: [self class]]) if ([obj isKindOfClass: [self class]])
return [_localeId isEqual: [obj localeIdentifier]]; {
return [_localeId isEqual: [obj localeIdentifier]];
}
return NO; return NO;
} }
@ -1050,28 +1051,26 @@ static NSRecursiveLock *classLock = nil;
- (NSString *) _getDecimalSeparator - (NSString *) _getDecimalSeparator
{ {
NSNumberFormatter *nFor; NSNumberFormatter *nFor;
NSString *result; NSString *result;
nFor = [[NSNumberFormatter alloc] init]; nFor = [[NSNumberFormatter alloc] init];
[nFor setLocale: self]; [nFor setLocale: self];
[nFor setNumberStyle: NSNumberFormatterDecimalStyle]; [nFor setNumberStyle: NSNumberFormatterDecimalStyle];
result = [nFor decimalSeparator]; result = [nFor decimalSeparator];
RELEASE(nFor); RELEASE(nFor);
return result; return result;
} }
- (NSString *) _getGroupingSeparator - (NSString *) _getGroupingSeparator
{ {
NSNumberFormatter *nFor; NSNumberFormatter *nFor;
NSString *result; NSString *result;
nFor = [[NSNumberFormatter alloc] init]; nFor = [[NSNumberFormatter alloc] init];
[nFor setLocale: self]; [nFor setLocale: self];
[nFor setNumberStyle: NSNumberFormatterDecimalStyle]; [nFor setNumberStyle: NSNumberFormatterDecimalStyle];
result = [nFor groupingSeparator]; result = [nFor groupingSeparator];
RELEASE(nFor); RELEASE(nFor);
return result; return result;
} }

52
Source/NSNumberFormatter.m
View file

@ -1523,16 +1523,17 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
return internal->_genDecimal; // FIXME return internal->_genDecimal; // FIXME
} }
- (void) setLocale: (NSLocale *)locale
- (void) setLocale: (NSLocale *) locale
{ {
RELEASE(internal->_locale); if (nil == locale)
{
if (locale == nil) locale = [NSLocale currentLocale];
locale = [NSLocale currentLocale]; }
internal->_locale = RETAIN(locale); if (NO == [locale isEqual: internal->_locale])
{
[self _resetUNumberFormat]; ASSIGN(internal->_locale, locale);
[self _resetUNumberFormat];
}
} }
- (NSLocale *) locale - (NSLocale *) locale
@ -2135,23 +2136,24 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
- (void) _resetUNumberFormat - (void) _resetUNumberFormat
{ {
#if GS_USE_ICU == 1 #if GS_USE_ICU == 1
unichar buffer[BUFFER_SIZE]; unichar buffer[BUFFER_SIZE];
NSUInteger length; NSUInteger length;
UNumberFormatStyle style; UNumberFormatStyle style;
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
const char *cLocaleId; const char *cLocaleId;
int32_t idx; int32_t idx;
if (internal->_formatter) if (internal->_formatter)
unum_close(internal->_formatter); {
unum_close(internal->_formatter);
}
cLocaleId = [[internal->_locale localeIdentifier] UTF8String]; cLocaleId = [[internal->_locale localeIdentifier] UTF8String];
style = NSToICUFormatStyle (internal->_style); style = NSToICUFormatStyle (internal->_style);
internal->_formatter = unum_open (style, NULL, 0, cLocaleId, NULL, &err); internal->_formatter = unum_open (style, NULL, 0, cLocaleId, NULL, &err);
if (U_FAILURE(err)) if (U_FAILURE(err))
internal->_formatter = NULL; {
internal->_formatter = NULL;
}
// Reset all properties // Reset all properties
for (idx = 0; idx < MAX_SYMBOLS; ++idx) for (idx = 0; idx < MAX_SYMBOLS; ++idx)
{ {
@ -2159,7 +2161,9 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
{ {
length = [internal->_symbols[idx] length]; length = [internal->_symbols[idx] length];
if (length > BUFFER_SIZE) if (length > BUFFER_SIZE)
length = BUFFER_SIZE; {
length = BUFFER_SIZE;
}
[internal->_symbols[idx] getCharacters: buffer [internal->_symbols[idx] getCharacters: buffer
range: NSMakeRange (0, length)]; range: NSMakeRange (0, length)];
unum_setSymbol (internal->_formatter, idx, buffer, length, &err); unum_setSymbol (internal->_formatter, idx, buffer, length, &err);
@ -2172,9 +2176,11 @@ static NSUInteger _defaultBehavior = NSNumberFormatterBehavior10_4;
{ {
length = [internal->_textAttributes[idx] length]; length = [internal->_textAttributes[idx] length];
if (length > BUFFER_SIZE) if (length > BUFFER_SIZE)
length = BUFFER_SIZE; {
length = BUFFER_SIZE;
}
[internal->_textAttributes[idx] getCharacters: buffer [internal->_textAttributes[idx] getCharacters: buffer
range: NSMakeRange (0, length)]; range: NSMakeRange (0, length)];
unum_setTextAttribute unum_setTextAttribute
(internal->_formatter, idx, buffer, length, &err); (internal->_formatter, idx, buffer, length, &err);
} }