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

Remove unused values

Browse Source
This commit is contained in:
Michał Janiszewski 2019-03-06 23:44:07 +01:00 committed by Howard Wolosky
parent ca01a7e444
commit 6c0e4e81e7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ void CHistoryCollector::PopLastOpndStart()
void CHistoryCollector::AddOpenBraceToHistory() void CHistoryCollector::AddOpenBraceToHistory()
{ {
int iCommandEnd = AddCommand(std::make_shared<CParentheses>(IDC_OPENP)); AddCommand(std::make_shared<CParentheses>(IDC_OPENP));
int ichOpndStart = IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_OPENP), -1); int ichOpndStart = IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_OPENP), -1);
PushLastOpndStart(ichOpndStart); PushLastOpndStart(ichOpndStart);
@ -171,7 +171,7 @@ void CHistoryCollector::AddOpenBraceToHistory()
void CHistoryCollector::AddCloseBraceToHistory() void CHistoryCollector::AddCloseBraceToHistory()
{ {
int iCommandEnd = AddCommand(std::make_shared<CParentheses>(IDC_CLOSEP)); AddCommand(std::make_shared<CParentheses>(IDC_CLOSEP));
IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_CLOSEP), -1); IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_CLOSEP), -1);
SetExpressionDisplay(); SetExpressionDisplay();
PopLastOpndStart(); PopLastOpndStart();
@ -450,20 +450,16 @@ std::shared_ptr<CalculatorVector<int>> CHistoryCollector::GetOperandCommandsFrom
std::shared_ptr<CalculatorVector<int>> commands = std::make_shared<CalculatorVector<int>>(); std::shared_ptr<CalculatorVector<int>> commands = std::make_shared<CalculatorVector<int>>();
// Check for negate // Check for negate
bool fNegative = (numStr[0] == L'-'); bool fNegative = (numStr[0] == L'-');
bool fSciFmt = false;
bool fDecimal = false;
for (size_t i = (fNegative ? 1 : 0); i < numStr.length(); i++) for (size_t i = (fNegative ? 1 : 0); i < numStr.length(); i++)
{ {
if (numStr[i] == m_decimalSymbol) if (numStr[i] == m_decimalSymbol)
{ {
IFT(commands->Append(IDC_PNT)); IFT(commands->Append(IDC_PNT));
fDecimal = true;
} }
else if (numStr[i] == L'e') else if (numStr[i] == L'e')
{ {
IFT(commands->Append(IDC_EXP)); IFT(commands->Append(IDC_EXP));
fSciFmt = true;
} }
else if (numStr[i] == L'-') else if (numStr[i] == L'-')
{ {