diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5270f06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +-c *.o\n/calc diff --git a/calc b/calc deleted file mode 100755 index 023ec18..0000000 Binary files a/calc and /dev/null differ diff --git a/calc.c b/calc.c index 85f1466..0898b46 100644 --- a/calc.c +++ b/calc.c @@ -3,30 +3,44 @@ int main(){ FILE *fp = NULL; - int operand1, operand2; + + int (*fp_add) (int, int); + int (*fp_minus) (int, int); + int (*fp_mul) (int, int); + float (*fp_div) (float, float); + + int operand1, operand2; char operator = ' '; - int result, line = 0; + float result; + int line = 0; fp = fopen("read.txt","r"); + + fp_add = add; + fp_minus = minus; + fp_mul = mul; + fp_div = div; + if(fp!=NULL){ fscanf(fp, "%d", &line); - for(int i=0; i