starnakin/42_CPP09
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: do calcul in right order

Browse Source
This commit is contained in:
starnakin 2023-12-16 12:19:37 +01:00
parent a37a07615b
commit 481de18bbd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ex01/src/main.cpp
View File

@ -16,10 +16,10 @@ int calculate(std::stack<int>& nums, std::stack<char>& operators)
return 0; return 0;
int ret; int ret;
int a = nums.top();
nums.pop();
int b = nums.top(); int b = nums.top();
nums.pop(); nums.pop();
int a = nums.top();
nums.pop();
switch (operators.top()) { switch (operators.top()) {
case '+': case '+':
@ -60,17 +60,19 @@ int main(int ac, char** av)
if (std::isdigit(av[1][i])) if (std::isdigit(av[1][i]))
nums.push(av[1][i] - '0'); nums.push(av[1][i] - '0');
else if (std::strchr("/+-*", av[1][i]) != NULL) else if (std::strchr("/+-*", av[1][i]) != NULL)
{
operators.push(av[1][i]); operators.push(av[1][i]);
if (calculate(nums, operators))
{
std::cout << "error: division by 0" << std::endl;
return 1;
}
}
else else
{ {
std::cout << "error: '" << av[1][i] << "' unknown char" << std::endl; std::cout << "error: '" << av[1][i] << "' unknown char" << std::endl;
return 1; return 1;
} }
if (calculate(nums, operators))
{
std::cout << "error: division by 0" << std::endl;
return 1;
}
} }
if (nums.size() != 1) if (nums.size() != 1)
{ {
@ -79,7 +81,7 @@ int main(int ac, char** av)
} }
if (operators.size() != 0) if (operators.size() != 0)
{ {
std::cout << "error: too manu operators" << std::endl; std::cout << "error: too many operators" << std::endl;
return 1; return 1;
} }
std::cout << nums.top(); std::cout << nums.top();