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..11344c9 100644 --- a/calc.c +++ b/calc.c @@ -1,32 +1,42 @@ #include #include "operators.h" +double cal (double oper1,double oper2, double (*func)(double,double)) +{ + return func(oper1,oper2); +} + + int main(){ FILE *fp = NULL; - int operand1, operand2; + double operand1, operand2; char operator = ' '; - int result, line = 0; + double result; + int line = 0; + double (*func)(double, double)=NULL; fp = fopen("read.txt","r"); if(fp!=NULL){ fscanf(fp, "%d", &line); - - for(int i=0; i