Skip to content
Snippets Groups Projects
Commit 67c70e1e authored by Michael Schneider's avatar Michael Schneider
Browse files

Merge branch 'master' into 'master'

FINALLY FIX INDENTS

See merge request ms180498/rpn_collab!3
parents 58d16324 a4821020
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ int plus( int a, int b) { return a + b; }
int minus( int a, int b) { return a - b; }
int multiply(int a, int b) { return a * b; }
int divide( int a, int b) { return a / b; }
int power( int a, int b) { return std::pow(a, b); }
int power( int a, int b) { return std::pow(a, b); }
int modulo( int a, int b) { return a % b; }
int pop_stack(auto &stack) {
......@@ -32,7 +32,7 @@ int evaluate(const std::string &s) {
case '-': change_stack_state(minus, stack); break;
case '*': change_stack_state(multiply, stack); break;
case '/': change_stack_state(divide, stack); break;
case '^': change_stack_state(power, stack); break;
case '^': change_stack_state(power, stack); break;
case '%': change_stack_state(modulo, stack); break;
case '0'...'9': stack.push(c - '0'); break;
default:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment