DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert ExpressionCommand and History collector to use Rational instead of PRAT

Browse Source
This commit is contained in:
Josh Koon
2019-01-28 19:14:15 -08:00
parent c13b8a099e
commit 4883fab7f7
5 changed files with 31 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/CalcManager/CEngine/History.cpp
View File

@@ -12,6 +12,7 @@
constexpr int ASCII_0 = 48;
using namespace std;
using namespace CalcEngine;
void CHistoryCollector::ReinitHistory()
{
@@ -51,7 +52,7 @@ CHistoryCollector::~CHistoryCollector()
}
}
void CHistoryCollector::AddOpndToHistory(wstring_view numStr, PRAT hNoNum, bool fRepetition)
void CHistoryCollector::AddOpndToHistory(wstring_view numStr, Rational rat, bool fRepetition)
{
std::shared_ptr<CalculatorVector<int>> commands = std::make_shared<CalculatorVector<int>>();
// Check for negate
@@ -91,8 +92,7 @@ void CHistoryCollector::AddOpndToHistory(wstring_view numStr, PRAT hNoNum, bool
}
}
auto operandCommand = std::make_shared<COpndCommand>(commands, fNegative, fDecimal, fSciFmt);
operandCommand->Initialize(hNoNum);
auto operandCommand = std::make_shared<COpndCommand>(commands, rat, fNegative, fDecimal, fSciFmt);
int iCommandEnd = AddCommand(operandCommand);
m_lastOpStartIndex = IchAddSzToEquationSz(numStr, iCommandEnd);

29
src/CalcManager/CEngine/scicomm.cpp
View File

@@ -211,9 +211,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
if (!m_HistoryCollector.FOpndAddedToHistory())
{
// if the prev command was ) or unop then it is already in history as a opnd form (...)
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
}
/* m_bChangeOp is true if there was an operation done and the */
@@ -310,10 +308,7 @@ DoPrecedenceCheckAgain:
{
if (!m_HistoryCollector.FOpndAddedToHistory())
{
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
}
m_HistoryCollector.AddUnaryOpToHistory((INT)wParam, m_bInv, m_angletype);
@@ -339,9 +334,7 @@ DoPrecedenceCheckAgain:
if(wParam == IDC_PERCENT)
{
CheckAndAddLastBinOpToHistory();
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat, true);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal, true);
}
/* reset the m_bInv flag and indicators if it is set
@@ -464,9 +457,7 @@ DoPrecedenceCheckAgain:
if (!m_HistoryCollector.FOpndAddedToHistory())
{
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
}
do {
@@ -485,9 +476,7 @@ DoPrecedenceCheckAgain:
m_currentVal = m_holdVal;
DisplayNum(); // to update the m_numberString
m_HistoryCollector.AddBinOpToHistory(m_nOpCode, false);
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat); // Adding the repeated last op to history
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal); // Adding the repeated last op to history
}
// Do the current or last operation.
@@ -595,9 +584,7 @@ DoPrecedenceCheckAgain:
if (!m_HistoryCollector.FOpndAddedToHistory())
{
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
}
// Get the operation and number and return result.
@@ -701,9 +688,7 @@ DoPrecedenceCheckAgain:
if (!m_HistoryCollector.FOpndAddedToHistory())
{
PRAT curRat = m_currentVal.ToPRAT();
m_HistoryCollector.AddOpndToHistory(m_numberString, curRat);
destroyrat(curRat);
m_HistoryCollector.AddOpndToHistory(m_numberString, m_currentVal);
}
PRAT curRat = m_currentVal.ToPRAT();