github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify how we manage sign in integer mode

Browse source
This commit is contained in:
Rudy Huyn 2019-04-01 00:17:19 -07:00
commit 68fbe4e6bf
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/CalcManager/CEngine/scioper.cpp
View file

@ -78,7 +78,7 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
case IDC_DIV: case IDC_DIV:
case IDC_MOD: case IDC_MOD:
{ {
int iNumeratorSign = 1, iDenominatorSign = 1, iFinalSign = 1; int iNumeratorSign = 1, iDenominatorSign = 1;
auto temp = result; auto temp = result;
result = rhs; result = rhs;
@ -107,30 +107,30 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
if (operation == IDC_DIV) if (operation == IDC_DIV)
{ {
iFinalSign = iNumeratorSign * iDenominatorSign;
result /= temp; result /= temp;
if (m_fIntegerMode && (iNumeratorSign * iDenominatorSign) == -1)
{
result = -(Integer(result));
}
} }
else else
{ {
if (m_fIntegerMode) if (m_fIntegerMode)
{ {
// Programmer mode, use remrat (remainder after division) // Programmer mode, use remrat (remainder after division)
iFinalSign = iNumeratorSign;
result %= temp; result %= temp;
if (iNumeratorSign == -1)
{
result = -(Integer(result));
}
} }
else else
{ {
//other modes, use modrat (modulus after division) //other modes, use modrat (modulus after division)
iFinalSign = iDenominatorSign;
result = Mod(result, temp); result = Mod(result, temp);
} }
} }
if (m_fIntegerMode && iFinalSign == -1)
{
result = -(Integer(result));
}
break; break;
} }