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

Trim the string when it exceeds the maximum allowed length in Standard mode

Browse source
This commit is contained in:
Naveen 2019-03-08 01:37:55 +01:00
commit 7068311643
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/CalcViewModel/Common/CopyPasteManager.cpp
View file

@ -307,11 +307,12 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
// or which will break conversion from string-to-ULL. // or which will break conversion from string-to-ULL.
wstring operandValue = SanitizeOperand(operand); wstring operandValue = SanitizeOperand(operand);
// If an operand exceeds the maximum length allowed, break and return. // If an operand exceeds the maximum length allowed, trim it to its allowed length.
if (OperandLength(operandValue, mode, modeType, programmerNumberBase) > maxOperandLength) size_t OperandLen = OperandLength(operandValue, mode, modeType, programmerNumberBase);
if (OperandLen > maxOperandLength)
{ {
expMatched = false; // Try to trim the length to allowed length
break; TrimOperand(operandValue, OperandLen - maxOperandLength);
} }
// If maxOperandValue is set and the operandValue exceeds it, break and return. // If maxOperandValue is set and the operandValue exceeds it, break and return.
@ -339,6 +340,11 @@ bool CopyPasteManager::ExpressionRegExMatch(vector<wstring> operands, ViewMode m
return expMatched; return expMatched;
} }
void CopyPasteManager::TrimOperand(std::wstring& operand, size_t exceededBy)
{
operand = operand.substr(0, operand.length() - exceededBy);
}
pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType) pair<size_t, uint64_t> CopyPasteManager::GetMaxOperandLengthAndValue(ViewMode mode, CategoryGroupType modeType, int programmerNumberBase, int bitLengthType)
{ {
size_t maxLength = 0; size_t maxLength = 0;

1
src/CalcViewModel/Common/CopyPasteManager.h
View file

@ -58,6 +58,7 @@ namespace CalculatorApp
static size_t OperandLength(std::wstring operand, CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1); static size_t OperandLength(std::wstring operand, CalculatorApp::Common::ViewMode mode, CalculatorApp::Common::CategoryGroupType modeType, int programmerNumberBase = -1);
static size_t StandardScientificOperandLength(std::wstring operand); static size_t StandardScientificOperandLength(std::wstring operand);
static size_t ProgrammerOperandLength(const std::wstring& operand, int numberBase); static size_t ProgrammerOperandLength(const std::wstring& operand, int numberBase);
static void TrimOperand(std::wstring& operand, size_t exceededBy);
static constexpr size_t MaxStandardOperandLength = 16; static constexpr size_t MaxStandardOperandLength = 16;
static constexpr size_t MaxScientificOperandLength = 32; static constexpr size_t MaxScientificOperandLength = 32;