From f3a961068aacd0abf8e007b23b680d6f93782f41 Mon Sep 17 00:00:00 2001
From: 201624606 <juyun58@naver.com>
Date: Thu, 4 May 2017 17:26:33 +0900
Subject: [PATCH 1/2] Lab9

---
 calc.c      | 48 ++++++++++++++++++++++++++++--------------------
 operators.c | 11 +++++------
 operators.h |  8 ++++----
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/calc.c b/calc.c
index 85f1466..bcc344d 100644
--- a/calc.c
+++ b/calc.c
@@ -1,33 +1,41 @@
 #include <stdio.h>
 #include "operators.h"
 
+double calc(double op1, double op2, char op) {
+	double (*func)(double, double);
+	double ans;
+	switch(op) {
+		case '+': 
+		func = add;
+		break;
+		case '-':
+		func = minus;
+		break;
+		case '*':
+		func = mul;
+		break;
+		case '/':
+		func = div;
+		break;
+	}
+	ans = func(op1, op2);
+	return ans;
+}
+
 int main(){
 	FILE *fp = NULL;
-	int operand1, operand2;
+	double operand1, operand2;
 	char operator = ' ';
-	int result, line = 0;
+	int line = 0;
+	double result = 0;
 
 	fp = fopen("read.txt","r");
 	if(fp!=NULL){
 		fscanf(fp, "%d", &line);
-	
-		for(int i=0; i<line; i++) {
-			fscanf(fp, "%d %c %d",&operand1, &operator, &operand2);
-			switch(operator) {
-				case '+':
-				result = add(operand1, operator);
-				break;
-				case '-':
-				result = minus(operand1, operator);
-				break;
-				case '*':
-				result = mul(operand1, operator);
-				case '/':
-				result = div(operand1, operator);
-				break;
-			}		
-			printf("%d %c %d = %d\n",
-				 operand1, operator, operand2, result);
+		for(int i=1; i<line; i++) {
+			fscanf(fp, "%lf %c %lf",&operand1, &operator, &operand2);
+			result = calc(operand1, operand2, operator);
+			printf("%lf %c %lf = %f\n", operand1, operator, operand2, result);
 		}
 	}
 	return 0;
diff --git a/operators.c b/operators.c
index d51cb3e..d63e879 100644
--- a/operators.c
+++ b/operators.c
@@ -1,16 +1,15 @@
 #include "operators.h"
 
-int add(int op1, int op2) {
+double add(double op1, double op2) {
 	return op1+op2;
 }
-int minus(int op1, int op2) {
+double minus(double op1, double op2) {
 	return op1-op2;
 }
-int mul(int op1, int op2) {
+double mul(double op1, double op2) {
 	return op1*op2;
 }
-
-int div(int op1, int op2) {
-	return op1%op2;
+double div(double op1, double op2) {
+	return op1/op2;
 }
 
diff --git a/operators.h b/operators.h
index bd08f7d..0172ff3 100644
--- a/operators.h
+++ b/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);
+double add(double op1, double op2);
+double mul(double op1, double op2);
+double div(double op1, double op2);
+double minus(double op1, double op2);

From b1d4a05618de54a3e959f3b32dd30b332ba3fa03 Mon Sep 17 00:00:00 2001
From: 201624606 <juyun58@naver.com>
Date: Mon, 12 Jun 2017 17:08:35 +0900
Subject: [PATCH 2/2] Implement my_fscanf()

---
 calc.c      |  7 ++++---
 my_fscanf.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 my_fscanf.h |  7 +++++++
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 my_fscanf.c
 create mode 100644 my_fscanf.h

diff --git a/calc.c b/calc.c
index bcc344d..58bf957 100644
--- a/calc.c
+++ b/calc.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include "operators.h"
+#include "my_fscanf.h"
 
 double calc(double op1, double op2, char op) {
 	double (*func)(double, double);
@@ -31,11 +32,11 @@ int main(){
 
 	fp = fopen("read.txt","r");
 	if(fp!=NULL){
-		fscanf(fp, "%d", &line);
+		my_fscanf(fp, "%d", &line);
 		for(int i=1; i<line; i++) {
-			fscanf(fp, "%lf %c %lf",&operand1, &operator, &operand2);
+			my_fscanf(fp, "%f %c %f",&operand1, &operator, &operand2);
 			result = calc(operand1, operand2, operator);
-			printf("%lf %c %lf = %f\n", operand1, operator, operand2, result);
+			printf("%f %c %f = %f\n", operand1, operator, operand2, result);
 		}
 	}
 	return 0;
diff --git a/my_fscanf.c b/my_fscanf.c
new file mode 100644
index 0000000..3fa9e4b
--- /dev/null
+++ b/my_fscanf.c
@@ -0,0 +1,42 @@
+#include "my_fscanf.h"
+#include <stdarg.h>
+#include <ctype.h>
+
+void my_fscanf(FILE *fp, const char *format, ...) {
+	va_list list;
+	va_start(list, format);
+	while(*format) {
+		if(*format == '%') {
+			format++;
+			switch(*format) {
+			case 'd': {
+				int c = getc(fp);
+				int *pInt = va_arg(list, int*);
+				*pInt = c - '0';
+				break;
+			}
+			case 'f': {
+				int c = getc(fp);
+				while(isspace(c)) { c = getc(fp); }
+				double *pDouble = va_arg(list, double*);
+				double num = 0;
+				while(isdigit(c)) {
+					num = num*10 + c - '0';
+					c = getc(fp);
+				}
+				*pDouble = num;
+				break;
+			}
+			case 'c': {
+				char c = getc(fp);				
+				char *pChar = va_arg(list, char*);
+				*pChar = c;
+				break;
+			}			
+			}
+		}
+		else
+			format++;
+	}
+	va_end(list);
+}	
diff --git a/my_fscanf.h b/my_fscanf.h
new file mode 100644
index 0000000..f02b184
--- /dev/null
+++ b/my_fscanf.h
@@ -0,0 +1,7 @@
+#ifndef MY_FSCANF_H
+#define MY_FSCANF_H
+#include <stdio.h>
+
+void my_fscanf(FILE *fp, const char *format, ...);
+
+#endif /* !MY_FSCANF_H */