RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

Calculator: Finish operation-in-progress only on new binary operations

Browse source 
Because of this the unary operations got applied to the result of the
operation-in-progress instead of the current argument as shown here:

    `16 + 9 <sqrt> =`
        Previous output: `sqrt(16 + 9)` = `5`
        Expected output: `16 + sqrt(9)` = `19`
This commit is contained in:
ronak69 2023-12-24 06:13:17 +00:00 • committed by Andrew Kaster
parent b634792022
commit 75183402fd
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applications/Calculator/Calculator.cpp
View file

@ -18,12 +18,6 @@ Optional<Crypto::BigFraction> Calculator::operation_with_literal_argument(Operat
operation = Operation::None; // Don't apply the "%" operation twice operation = Operation::None; // Don't apply the "%" operation twice
} }
// If a previous operation is still in progress, finish it
// Makes hitting "1+2+3=" equivalent to hitting "1+2=+3="
if (m_binary_operation_in_progress != Operation::None) {
argument = finish_binary_operation(m_binary_operation_saved_left_side, m_binary_operation_in_progress, argument);
}
switch (operation) { switch (operation) {
case Operation::None: case Operation::None:
m_current_value = argument; m_current_value = argument;
@ -33,6 +27,11 @@ Optional<Crypto::BigFraction> Calculator::operation_with_literal_argument(Operat
case Operation::Subtract: case Operation::Subtract:
case Operation::Multiply: case Operation::Multiply:
case Operation::Divide: case Operation::Divide:
// If a previous operation is still in progress, finish it
// Makes hitting "1+2+3=" equivalent to hitting "1+2=+3="
if (m_binary_operation_in_progress != Operation::None) {
argument = finish_binary_operation(m_binary_operation_saved_left_side, m_binary_operation_in_progress, argument);
}
m_binary_operation_saved_left_side = argument; m_binary_operation_saved_left_side = argument;
m_binary_operation_in_progress = operation; m_binary_operation_in_progress = operation;
m_current_value = argument; m_current_value = argument;
@ -45,7 +44,6 @@ Optional<Crypto::BigFraction> Calculator::operation_with_literal_argument(Operat
break; break;
} }
m_current_value = argument.sqrt(); m_current_value = argument.sqrt();
clear_operation();
break; break;
case Operation::Inverse: case Operation::Inverse:
if (argument == Crypto::BigFraction {}) { if (argument == Crypto::BigFraction {}) {
@ -54,7 +52,6 @@ Optional<Crypto::BigFraction> Calculator::operation_with_literal_argument(Operat
break; break;
} }
m_current_value = argument.invert(); m_current_value = argument.invert();
clear_operation();
break; break;
case Operation::Percent: case Operation::Percent:
m_current_value = argument * Crypto::BigFraction { 1, 100 }; m_current_value = argument * Crypto::BigFraction { 1, 100 };
@ -79,6 +76,9 @@ Optional<Crypto::BigFraction> Calculator::operation_with_literal_argument(Operat
m_current_value = m_mem; m_current_value = m_mem;
break; break;
case Operation::Equals: case Operation::Equals:
if (m_binary_operation_in_progress != Operation::None) {
argument = finish_binary_operation(m_binary_operation_saved_left_side, m_binary_operation_in_progress, argument);
}
m_current_value = argument; m_current_value = argument;
break; break;
} }