Lab9

.gitignore

@@ -0,0 +1,2 @@
+*.o
+calc

calc.c

@@ -5,31 +5,46 @@ int main(){
 	FILE *fp = NULL;
 	int operand1, operand2;
 	char operator = ' ';
-	int result, line = 0;
+	float result, line = 0;
 
 	fp = fopen("read.txt","r");
 	if(fp!=NULL){
-		fscanf(fp, "%d", &line);
+		fscanf(fp, "%f", &line);
 
 		for(int i=0; i<line; i++) {
-			fscanf(fp, "%d %c %d",&operand1, &operator, &operand2);
-			switch(operator) {
-				case '+':
-				result = add(operand1, operator);
+			fscanf(fp, "%d %c %d",&operand1, &operator, &operand2); 
+                    float (*cal)(float, float);
+                    if (operator == '+')
+                            cal = add;
+                    else if (operator == '-')
+                            cal = minus;
+                    else if (operator == '*')
+                            cal = mul;
+                    else if (operator == '/')
+                            cal = div;
+
+                    result = cal(operand1, operand2);
+                    printf("%d %c %d = %f\n", operand1, operator, operand2, result); 
+            } 
+				/*case '+':
+				result = add(operand1, operand2);
 				break;
 				case '-':
-				result = minus(operand1, operator);
+				result = minus(operand1, operand2);
 				break;
 				case '*':
-				result = mul(operand1, operator);
-				case '/':
-				result = div(operand1, operator);
+				result = mul(operand1, operand2);
 				break;
-			}		
-			printf("%d %c %d = %d\n",
-				 operand1, operator, operand2, result);
-		}
-	}
+				case '/':
+				result = div(operand1, operand2);
+				break;  */
+
+		/*	printf("%d %c %d = %f\n",
+				 operand1, operator, operand2, result); */
+
 	return 0;
 }
 
+}
+
+

operators.c

@@ -1,16 +1,16 @@
 #include "operators.h"
 
-int add(int op1, int op2) {
+float add(float op1, float op2) {
 	return op1+op2;
 }
-int minus(int op1, int op2) {
+float minus(float op1, float op2) {
 	return op1-op2;
 }
-int mul(int op1, int op2) {
+float mul(float op1, float op2) {
 	return op1*op2;
 }
 
-int div(int op1, int op2) {
-	return op1%op2;
+float div(float op1, float op2) {
+	return op1/op2;
 }
 

operators.h

@@ -1,4 +1,4 @@
-int add(int op1, int op2);
-int mul(int op1, int op2);
-int div(int op1, int op2);
-int minus(int op1, int op2);
+float add(float op1, float op2);
+float mul(float op1, float op2);
+float div(float op1, float op2);
+float minus(float op1, float op2);