diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..52a4698 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +CC=gcc +CFLAGES= -c -Wall +all:prog +prog: calc.o helpers.o + $(CC) -o mycalc calc.o helpers.o -lm +calc.o: calc.c + $(CC) $(CFLAGES) calc.c +helper.o: helper.c + $(CC) $(CFLAGES) helpers.c +clean: + rm -rf *.o + diff --git a/calc.c b/calc.c index dca5452..7ac2177 100644 --- a/calc.c +++ b/calc.c @@ -33,7 +33,7 @@ static struct token* opStack; static int outCount; static double* outStack; -static const int binary[] = { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; +static const int binary[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0, 0 }; static const int precedence[] = { 0, 0, 1, 1, 1, 2, 3, 4, 4, 5 }; static const int association[] = { 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; @@ -91,7 +91,7 @@ int execute(struct token temp) { case '%': result = fmod(d1, d2); break; - case '#': + case '^': result = pow(d1, d2); break; }