colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-21 01:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for #1720: CPDecimalCompare problems when comparing to zero.

Browse Source
This commit is contained in:
Stephen Ierodiaconou
2013-01-30 13:03:43 +02:00
parent eefec02de4
commit e17253d592
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPDecimal.j
+6 -3
View File
@@ -386,16 +386,19 @@ function CPDecimalCompare(leftOperand, rightOperand)
s1 = leftOperand._exponent + leftOperand._mantissa.length,
s2 = rightOperand._exponent + rightOperand._mantissa.length;
if (leftIsZero || s1 < s2)
if (leftIsZero && rightIsZero)
return CPOrderedSame;
if (leftIsZero || (s1 < s2 && !rightIsZero))
{
if (rightOperand._isNegative)
return CPOrderedDescending;
else
return CPOrderedAscending;
}
if (rightIsZero || s1 > s2)
if (rightIsZero || (s1 > s2 && !leftIsZero))
{
if (rightOperand._isNegative)
if (leftOperand._isNegative)
return CPOrderedAscending;
else
return CPOrderedDescending;
Tests/Foundation/CPDecimalTest.j
+27 -2
View File
@@ -339,12 +339,37 @@
dcm1 = CPDecimalMakeWithString(@"0.0");
dcm = CPDecimalMakeWithString(@"0.5");
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedAscending equals:c message:"CPDecimalCompare() Tc4: should be descending"];
[self assert:CPOrderedAscending equals:c message:"CPDecimalCompare() (0.0, 0.5) should be ascending"];
dcm1 = CPDecimalMakeWithString(@"0.0");
dcm = CPDecimalMakeWithString(@"-0.5");
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedDescending equals:c message:"CPDecimalCompare() Tc4: should be descending"];
[self assert:CPOrderedDescending equals:c message:"CPDecimalCompare() (0, -0.5) should be descending"];
dcm1 = CPDecimalMakeZero();
dcm = CPDecimalMakeZero();
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedSame equals:c message:"CPDecimalCompare(): zeros should be same"];
dcm1 = CPDecimalMakeWithString(@"0.0001");
dcm = CPDecimalMakeZero();
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedDescending equals:c message:"CPDecimalCompare(): (0.0001, 0) should be descending"];
dcm1 = CPDecimalMakeZero();
dcm = CPDecimalMakeWithString(@"0.0001");
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedAscending equals:c message:"CPDecimalCompare(): (0, 0.0001) should be ascending"];
dcm1 = CPDecimalMakeWithString(@"-0.0001");
dcm = CPDecimalMakeZero();
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedAscending equals:c message:"CPDecimalCompare(): (-0.0001, 0) should be ascending"];
dcm1 = CPDecimalMakeZero();
dcm = CPDecimalMakeWithString(@"-0.0001");
c = CPDecimalCompare(dcm1,dcm);
[self assert:CPOrderedDescending equals:c message:"CPDecimalCompare(): (0, -0.0001) should be descending"];
}
- (void)testCompact