Skip to content

fix ^ #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bbirkental wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix ^ #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712451a
fix ^
Dec 31, 2018
5ec2f71
add Makefile
Jan 7, 2019
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
14 changes: 14 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# https://github.com/BankHapoalim/calc.git
# to run this code type make in command line and see prog file create
CC=gcc
CFLAGES= -c -Wall
all: prog
prog: calc.o helpers.o
$(CC) calc.o helpers.o -lm -o prog
calc.o: calc.c
$(CC) $(CFLAGES) calc.c
helpers.o: helpers.c
$(CC) $(CFLAGES) helpers.c
clean:
rm -rf *.o

6 changes: 5 additions & 1 deletion calc.c
View file
Open in desktop
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 @@ -94,6 +94,10 @@ int execute(struct token temp) {
case '#':
result = pow(d1, d2);
break;
case '^':
result = pow(d1, d2);
break;

}
}

Expand Down