Skip to content
Open

fix #17

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#how to run it
#http

CC=gcc
CFLAGS= -c -Wall
LFLAGS1= -lm
CFLAGS2= -std=c99
all: prog
prog: calc.o helpers.o
$(CC) calc.o helpers.o -o prog $(LFLAGS1)
calc.o: calc.c
$(CC) $(CFLAGS) calc.c
helpers.o: helpers.c
$(CC) $(CFLAGS) helpers.c
clean:
rm -rf *.o
Binary file added calc
Binary file not shown.
4 changes: 2 additions & 2 deletions calc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 };

Expand Down Expand Up @@ -91,7 +91,7 @@ int execute(struct token temp) {
case '%':
result = fmod(d1, d2);
break;
case '#':
case '^':
result = pow(d1, d2);
break;
}
Expand Down
Binary file added prog
Binary file not shown.