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

Add support for non-numeric and add test

Browse source
This commit is contained in:
Gregory John Casamento 2019-07-19 14:08:32 -04:00
parent 22fa547084
commit c5a99a0e40
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Source/NSByteCountFormatter.m
View file

@ -70,7 +70,7 @@ GS_PRIVATE_INTERNAL(NSByteCountFormatter)
{
NSByteCountFormatterUnits units = NSByteCountFormatterUseDefault;
if (byteCount >= KB)
if (byteCount >= KB || byteCount == 0.0)
{
units = NSByteCountFormatterUseKB;
}
@ -161,20 +161,27 @@ GS_PRIVATE_INTERNAL(NSByteCountFormatter)
unitName = @"bytes";
}
if(internal->_zeroPadsFractionDigits)
if(internal->_allowsNonnumericFormatting && count == 0.0)
{
outputFormat = [outputFormat stringByAppendingString: @"%01.08f"];
outputFormat = [outputFormat stringByAppendingString: @"Zero"];
}
else
{
NSInteger whole = (NSInteger)(count / 1);
double frac = (double)count - (double)whole;
if(frac > 0.0)
if(internal->_zeroPadsFractionDigits)
{
whole += 1;
outputFormat = [outputFormat stringByAppendingString: @"%01.08f"];
}
else
{
NSInteger whole = (NSInteger)(count / 1);
double frac = (double)count - (double)whole;
if(frac > 0.0)
{
whole += 1;
}
count = (double)whole;
outputFormat = [outputFormat stringByAppendingString: @"%01.0f"];
}
count = (double)whole;
outputFormat = [outputFormat stringByAppendingString: @"%01.0f"];
}
if(internal->_includesUnit)