Изменил(а) на 'du4/program.c'

This commit is contained in:
Vladyslav Korzun 2023-03-08 13:05:37 +00:00
parent e05d2334e2
commit 19407af88d

View File

@ -25,11 +25,18 @@ int main() {
break; break;
} }
for (int i = 0; i < strlen(znaky); i++) { for (int i = 0; i < strlen(znaky); i++) {
if (znaky[i] == '*' || znaky[i] == '/' || znaky[i] == '-' || znaky[i] == '+' || znaky[i] == '=') { if (znaky[i] == '*' || znaky[i] == '/' || znaky[i] == '+' || znaky[i] == '=') {
symbol[sym] = znaky[i]; symbol[sym] = znaky[i];
znaky[i] = ' '; znaky[i] = ' ';
sym++; sym++;
} }
if(znaky[i] == '-'){
if(znaky[i - 1] == ' ' && znaky[i + 1] == ' '){
symbol[sym] = znaky[i];
znaky[i] = ' ';
sym++;
}
}
} }
zaciatok_cisla = znaky; zaciatok_cisla = znaky;
while (*zaciatok_cisla != '\0') { while (*zaciatok_cisla != '\0') {
@ -52,19 +59,24 @@ int main() {
} }
} }
} }
if(symbol[sym - 2] == '+'){ int p = 0;
for(int j = 0; j < sym; j++){
if(symbol[j] == '=')
p = j;
}
if(symbol[p - 1] == '+'){
sr = a + b; sr = a + b;
//printf("%2.f", sr); //printf("%2.f", sr);
} }
if(symbol[sym - 2] == '-'){ if(symbol[p - 1] == '-'){
sr = a - b; sr = a - b;
//printf("%2.f", sr); //printf("%2.f", sr);
} }
if(symbol[sym - 2] == '*'){ if(symbol[p - 1] == '*'){
sr = a * b; sr = a * b;
//printf("%2.f", sr); //printf("%2.f", sr);
} }
if(symbol[sym - 2] == '/'){ if(symbol[p - 1] == '/'){
sr = a / b; sr = a / b;
//printf("%2.f", sr); //printf("%2.f", sr);
} }