github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-24 15:05:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert Rational::Rsh and ::Lsh to use >>=, >>, <<=, << operator overrides

Browse source
This commit is contained in:
Josh Koon 2019-02-21 11:02:53 -08:00
commit 5f641c1389
3 changed files with 61 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/CalcManager/CEngine/Rational.cpp
View file

@ -55,7 +55,7 @@ namespace CalcEngine
uint32_t hi = HIDWORD(ui); uint32_t hi = HIDWORD(ui);
uint32_t lo = LODWORD(ui); uint32_t lo = LODWORD(ui);
Rational temp = Rational{ hi }.Lsh(32, precision).Or(lo, precision); Rational temp = (Rational{ hi } << 32).Or(lo, precision);
m_p = Number{ temp.P() }; m_p = Number{ temp.P() };
m_q = Number{ temp.Q() }; m_q = Number{ temp.Q() };
@ -206,6 +206,52 @@ namespace CalcEngine
return *this; return *this;
} }
Rational& Rational::operator<<=(Rational const& rhs)
{
PRAT lhsRat = this->ToPRAT();
PRAT rhsRat = rhs.ToPRAT();
try
{
lshrat(&lhsRat, rhsRat, RATIONAL_BASE, RATIONAL_PRECISION);
destroyrat(rhsRat);
}
catch (DWORD error)
{
destroyrat(lhsRat);
destroyrat(rhsRat);
throw(error);
}
*this = Rational{ lhsRat };
destroyrat(lhsRat);
return *this;
}
Rational& Rational::operator>>=(Rational const& rhs)
{
PRAT lhsRat = this->ToPRAT();
PRAT rhsRat = rhs.ToPRAT();
try
{
rshrat(&lhsRat, rhsRat, RATIONAL_BASE, RATIONAL_PRECISION);
destroyrat(rhsRat);
}
catch (DWORD error)
{
destroyrat(lhsRat);
destroyrat(rhsRat);
throw(error);
}
*this = Rational{ lhsRat };
destroyrat(lhsRat);
return *this;
}
Rational operator+(Rational lhs, Rational const& rhs) Rational operator+(Rational lhs, Rational const& rhs)
{ {
lhs += rhs; lhs += rhs;
@ -236,50 +282,16 @@ namespace CalcEngine
return lhs; return lhs;
} }
Rational Rational::Lsh(Rational const& rhs, int32_t precision) const Rational operator<<(Rational lhs, Rational const& rhs)
{ {
PRAT lhsRat = this->ToPRAT(); lhs <<= rhs;
PRAT rhsRat = rhs.ToPRAT(); return lhs;
try
{
lshrat(&lhsRat, rhsRat, RATIONAL_BASE, precision);
destroyrat(rhsRat);
}
catch (DWORD error)
{
destroyrat(lhsRat);
destroyrat(rhsRat);
throw(error);
} }
Rational result = Rational{ lhsRat }; Rational operator>>(Rational lhs, Rational const& rhs)
destroyrat(lhsRat);
return result;
}
Rational Rational::Rsh(Rational const& rhs, int32_t precision) const
{ {
PRAT lhsRat = this->ToPRAT(); lhs >>= rhs;
PRAT rhsRat = rhs.ToPRAT(); return lhs;
try
{
rshrat(&lhsRat, rhsRat, RATIONAL_BASE, precision);
destroyrat(rhsRat);
}
catch (DWORD error)
{
destroyrat(lhsRat);
destroyrat(rhsRat);
throw(error);
}
Rational result = Rational{ lhsRat };
destroyrat(lhsRat);
return result;
} }
Rational Rational::Not(Rational const& chopNum, int32_t precision) const Rational Rational::Not(Rational const& chopNum, int32_t precision) const

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

@ -40,13 +40,13 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
bool fMsb = (w64Bits >> (m_dwWordBitWidth - 1)) & 1; bool fMsb = (w64Bits >> (m_dwWordBitWidth - 1)) & 1;
Rational holdVal = result; Rational holdVal = result;
result = rhs.Rsh(holdVal, m_precision); result = rhs >> holdVal;
if (fMsb) if (fMsb)
{ {
result = Integer(result, m_precision); result = Integer(result, m_precision);
auto tempRat = m_chopNumbers[m_numwidth].Rsh(holdVal, m_precision); auto tempRat = m_chopNumbers[m_numwidth] >> holdVal;
tempRat = Integer(tempRat, m_precision); tempRat = Integer(tempRat, m_precision);
tempRat = tempRat.Xor(m_chopNumbers[m_numwidth], m_precision); tempRat = tempRat.Xor(m_chopNumbers[m_numwidth], m_precision);
@ -61,7 +61,7 @@ CalcEngine::Rational CCalcEngine::DoOperation(int operation, CalcEngine::Rationa
throw CALC_E_NORESULT; throw CALC_E_NORESULT;
} }
result = rhs.Lsh(result, m_precision); result = rhs << result;
break; break;
case IDC_ADD: case IDC_ADD:

7
src/CalcManager/Header Files/Rational.h
View file

@ -36,14 +36,17 @@ namespace CalcEngine
Rational& operator/=(Rational const& rhs); Rational& operator/=(Rational const& rhs);
Rational& operator%=(Rational const& rhs); Rational& operator%=(Rational const& rhs);
Rational& operator<<=(Rational const& rhs);
Rational& operator>>=(Rational const& rhs);
friend Rational operator+(Rational lhs, Rational const& rhs); friend Rational operator+(Rational lhs, Rational const& rhs);
friend Rational operator-(Rational lhs, Rational const& rhs); friend Rational operator-(Rational lhs, Rational const& rhs);
friend Rational operator*(Rational lhs, Rational const& rhs); friend Rational operator*(Rational lhs, Rational const& rhs);
friend Rational operator/(Rational lhs, Rational const& rhs); friend Rational operator/(Rational lhs, Rational const& rhs);
friend Rational operator%(Rational lhs, Rational const& rhs); friend Rational operator%(Rational lhs, Rational const& rhs);
Rational Lsh(Rational const& r, int32_t precision) const; friend Rational operator<<(Rational lhs, Rational const& rhs);
Rational Rsh(Rational const& r, int32_t precision) const; friend Rational operator>>(Rational lhs, Rational const& rhs);
Rational Not(Rational const& chopNum, int32_t precision) const; Rational Not(Rational const& chopNum, int32_t precision) const;
Rational And(Rational const& r, int32_t precision) const; Rational And(Rational const& r, int32_t precision) const;