Изменил(а) на 'cv3/program.c'
This commit is contained in:
parent
3034a490df
commit
71bc6751f4
@ -33,25 +33,25 @@ bool calculatorLogic(char buffer[SIZE][SIZE]){
|
||||
|
||||
switch(buffer[currentlyInBuffer][0]){
|
||||
case '+':
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-1]) + atof(buffer[currentlyInBuffer-2]))*100)/100;
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-2]) + atof(buffer[currentlyInBuffer-1]))*100)/100;
|
||||
break;
|
||||
case '-':
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-1]) - atof(buffer[currentlyInBuffer-2]))*100)/100;
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-2]) - atof(buffer[currentlyInBuffer-1]))*100)/100;
|
||||
break;
|
||||
case '*':
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-1]) * atof(buffer[currentlyInBuffer-2]))*100)/100;
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-2]) * atof(buffer[currentlyInBuffer-1]))*100)/100;
|
||||
break;
|
||||
case '/':
|
||||
if(atof(buffer[currentlyInBuffer-2]) == 0.0)
|
||||
if(atof(buffer[currentlyInBuffer-1]) == 0.0)
|
||||
printf("division by zero\n");
|
||||
else
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-1]) / atof(buffer[currentlyInBuffer-2]))*100)/100;
|
||||
temporaryDecimal = round((atof(buffer[currentlyInBuffer-2]) / atof(buffer[currentlyInBuffer-1]))*100)/100;
|
||||
}
|
||||
|
||||
for(int i = currentlyInBuffer-3; currentlyInBuffer > i; currentlyInBuffer--)
|
||||
memset(buffer[currentlyInBuffer], SIZE, '\0');
|
||||
|
||||
gcvt(temporaryDecimal, 10, buffer[currentlyInBuffer]);
|
||||
gcvt(temporaryDecimal, 10, buffer[currentlyInBuffer++]);
|
||||
|
||||
for(int i = 0; i <= currentlyInBuffer; i++){
|
||||
if(i == currentlyInBuffer)
|
||||
@ -65,9 +65,9 @@ bool calculatorLogic(char buffer[SIZE][SIZE]){
|
||||
else{
|
||||
printf("bad input\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int main() {
|
||||
int main() {
|
||||
char buffer[SIZE][SIZE];
|
||||
for(int i = 0; i < SIZE; i++)
|
||||
memset(buffer[i], '\0', SIZE);
|
||||
@ -80,5 +80,4 @@ bool calculatorLogic(char buffer[SIZE][SIZE]){
|
||||
printf("no input\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user