wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 854531, part 3 - Fix bugs in Decimal::floor() and Decimal::ceiling(). r=Waldo

Browse Source
This commit is contained in:
Jonathan Watt 2013-05-06 00:23:16 +01:00
parent 1ea84d3685
commit 1875156601
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mfbt/decimal/Decimal.cpp
View File

@ -623,16 +623,16 @@ Decimal Decimal::ceiling() const
if (exponent() >= 0)
return *this;
uint64_t result = m_data.coefficient();
const int numberOfDigits = countDigits(result);
uint64_t coefficient = m_data.coefficient();
const int numberOfDigits = countDigits(coefficient);
const int numberOfDropDigits = -exponent();
if (numberOfDigits < numberOfDropDigits)
return isPositive() ? Decimal(1) : zero(Positive);
result = scaleDown(result, numberOfDropDigits - 1);
if (sign() == Positive && result % 10 > 0)
result += 10;
result /= 10;
uint64_t result = scaleDown(coefficient, numberOfDropDigits);
uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
if (droppedDigits && isPositive())
result += 1;
return Decimal(sign(), 0, result);
}
@ -665,16 +665,17 @@ Decimal Decimal::floor() const
if (exponent() >= 0)
return *this;
uint64_t result = m_data.coefficient();
const int numberOfDigits = countDigits(result);
uint64_t coefficient = m_data.coefficient();
const int numberOfDigits = countDigits(coefficient);
const int numberOfDropDigits = -exponent();
if (numberOfDigits < numberOfDropDigits)
return isPositive() ? zero(Positive) : Decimal(-1);
result = scaleDown(result, numberOfDropDigits - 1);
if (isNegative() && result % 10 > 0)
result += 10;
result /= 10;
uint64_t result = scaleDown(coefficient, numberOfDropDigits);
uint64_t droppedDigits = coefficient - scaleUp(result, numberOfDropDigits);
if (droppedDigits && isNegative()) {
result += 1;
}
return Decimal(sign(), 0, result);
}
@ -920,6 +921,8 @@ Decimal Decimal::round() const
if (numberOfDigits < numberOfDropDigits)
return zero(Positive);
// We're implementing round-half-away-from-zero, so we only need the one
// (the most significant) fractional digit:
result = scaleDown(result, numberOfDropDigits - 1);
if (result % 10 >= 5)
result += 10;