Skip to content

operator ^ fix #12

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
b0nz1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

operator ^ fix #12

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
d6a3c7a
operator ^ fix
skaterboy37 Dec 31, 2018
bf6a4f2
added new Makefile to the project
skaterboy37 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
20 changes: 20 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CC=gcc

CFLAGS= -c -Wall

all: prog

prog: calc.o helpers.o
$(CC) -std=c99 -o prog helpers.o calc.o -lm

calc.o: calc.c
$(CC) $(CFLAGS) calc.c

helpers.o: helpers.c
$(CC) $(CFLAGS) helpers.c

install:
cp ./prog /usr/local/bin
clean:
rm -rf *.o

8 changes: 5 additions & 3 deletions calc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <math.h>
#include <string.h>



#include "struct.h"
#include "helpers.h"

Expand Down Expand Up @@ -33,7 +35,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 +93,7 @@ int execute(struct token temp) {
case '%':
result = fmod(d1, d2);
break;
case '#':
case '^':
result = pow(d1, d2);
break;
}
Expand All @@ -106,7 +108,7 @@ int execute(struct token temp) {
d1 = outStack[--outCount];

switch(temp.subType) {
case '_':
case '_':
result = d1;
break;
case '~':
Expand Down