mirror of
https://github.com/sloven-c/calculator.git
synced 2025-10-30 20:37:23 +01:00
Fixed some of the footguns
This commit is contained in:
36
main.c
36
main.c
@@ -23,7 +23,7 @@ bool stack_higher_precedence(char op, char stackOp);
|
|||||||
|
|
||||||
stack split_into_tokens(string expression);
|
stack split_into_tokens(string expression);
|
||||||
|
|
||||||
string get_slice(int a, size_t b, const char *expression);
|
string get_slice(int a, int b, const char *expression);
|
||||||
|
|
||||||
bool validate_expression(const char *expression);
|
bool validate_expression(const char *expression);
|
||||||
|
|
||||||
@@ -33,14 +33,12 @@ void validate_malloc(const void *p);
|
|||||||
|
|
||||||
void throw_error(char *msg);
|
void throw_error(char *msg);
|
||||||
|
|
||||||
const char *OPERATORS[] = {"+-", "*/", "^", "()"};
|
|
||||||
|
|
||||||
int main(const int argc, char *argv[]) {
|
int main(const int argc, char *argv[]) {
|
||||||
const string expression = get_expression(argc, argv);
|
const string expression = get_expression(argc, argv);
|
||||||
if (expression.string == nullptr) return 0;
|
if (expression.string == nullptr) return 0;
|
||||||
|
|
||||||
stack tokens = split_into_tokens(expression);
|
stack tokens = split_into_tokens(expression);
|
||||||
stack_print(&tokens, "Tokens");
|
stack_print(&tokens, "tokens");
|
||||||
|
|
||||||
stack output_queue = get_output_queue(&tokens);
|
stack output_queue = get_output_queue(&tokens);
|
||||||
|
|
||||||
@@ -56,7 +54,7 @@ int main(const int argc, char *argv[]) {
|
|||||||
int calculate_stack(const stack *output_queue) {
|
int calculate_stack(const stack *output_queue) {
|
||||||
stack calculation_stack = stack_init(IntArray, output_queue->len);
|
stack calculation_stack = stack_init(IntArray, output_queue->len);
|
||||||
|
|
||||||
for (size_t i = 0; i <= output_queue->i; i++) {
|
for (int i = 0; i <= output_queue->i; i++) {
|
||||||
const stackData element = stack_get(output_queue, i);
|
const stackData element = stack_get(output_queue, i);
|
||||||
if (element.ret_code == 1)
|
if (element.ret_code == 1)
|
||||||
throw_error("Couldn't retrieve element from output queue for calculation stack push");
|
throw_error("Couldn't retrieve element from output queue for calculation stack push");
|
||||||
@@ -106,7 +104,8 @@ int str_to_num(char *string) {
|
|||||||
|
|
||||||
// ReSharper disable once CppNotAllPathsReturnValue
|
// ReSharper disable once CppNotAllPathsReturnValue
|
||||||
int calculate(const int a, const int b, const char op) {
|
int calculate(const int a, const int b, const char op) {
|
||||||
switch (op) {
|
// ReSharper disable once CppDefaultCaseNotHandledInSwitchStatement
|
||||||
|
switch (op) { // NOLINT(*-multiway-paths-covered)
|
||||||
case '+':
|
case '+':
|
||||||
return a + b;
|
return a + b;
|
||||||
case '-':
|
case '-':
|
||||||
@@ -157,7 +156,7 @@ stack get_output_queue(const stack *tokenisedExpression) {
|
|||||||
stack output_stack = stack_init(StringArray, tokenisedExpression->len);
|
stack output_stack = stack_init(StringArray, tokenisedExpression->len);
|
||||||
stack operator_stack = stack_init(CharArray, tokenisedExpression->len);
|
stack operator_stack = stack_init(CharArray, tokenisedExpression->len);
|
||||||
|
|
||||||
for (size_t i = 0; i < tokenisedExpression->i; i++) {
|
for (size_t i = 0; i <= tokenisedExpression->i; i++) {
|
||||||
const stackData token = stack_get(tokenisedExpression, i);
|
const stackData token = stack_get(tokenisedExpression, i);
|
||||||
if (token.ret_code == 1) throw_error("Failed to retrieve token");
|
if (token.ret_code == 1) throw_error("Failed to retrieve token");
|
||||||
|
|
||||||
@@ -216,19 +215,24 @@ int push_operator(const char operatorToPush, stack *output_stack, stack *operato
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool stack_higher_precedence(const char op, const char stackOp) {
|
bool stack_higher_precedence(const char op, const char stackOp) {
|
||||||
return validate_char(stackOp).opPrecedence > validate_char(op).opPrecedence;
|
const int stackOpPrecedence = validate_char(stackOp).opPrecedence, opPrecedence = validate_char(op).opPrecedence;
|
||||||
|
if (stackOpPrecedence == -1 || opPrecedence == -1) return false;
|
||||||
|
|
||||||
|
return stackOpPrecedence > opPrecedence;
|
||||||
}
|
}
|
||||||
|
|
||||||
stack split_into_tokens(const string expression) {
|
stack split_into_tokens(const string expression) {
|
||||||
stack tokenisedExpression = stack_init(StringArray, expression.len);
|
stack tokenisedExpression = stack_init(StringArray, expression.len);
|
||||||
int lastOp = -1;
|
int lastOp = -1;
|
||||||
|
|
||||||
for (size_t i = 0; i < expression.len; i++) {
|
// -1 is to not push \0 onto stack
|
||||||
|
for (size_t i = 0; i < expression.len - 1; i++) {
|
||||||
if (validate_char(expression.string[i]).type != Operator) continue;
|
if (validate_char(expression.string[i]).type != Operator) continue;
|
||||||
|
|
||||||
const string slice = get_slice(lastOp, i, expression.string);
|
const string slice = get_slice(lastOp, i, expression.string);
|
||||||
if (slice.string != nullptr) {
|
if (slice.string != nullptr) {
|
||||||
const int ret = stack_push(&tokenisedExpression, (stackInput){.string = slice.string}, false);
|
const int ret = stack_push(&tokenisedExpression, (stackInput){.string = slice.string}, false);
|
||||||
|
free(slice.string);
|
||||||
if (ret == 1) throw_error("Failed to push slice into stack");
|
if (ret == 1) throw_error("Failed to push slice into stack");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,19 +245,17 @@ stack split_into_tokens(const string expression) {
|
|||||||
return tokenisedExpression;
|
return tokenisedExpression;
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo fix edge case on beginning
|
string get_slice(int a, int b, const char *expression) {
|
||||||
string get_slice(int a, size_t b, const char *expression) {
|
const int len = b - a - 1;
|
||||||
const size_t len = b - abs(a) - 1;
|
|
||||||
if (len < 1) return (string){.string = nullptr};
|
if (len < 1) return (string){.string = nullptr};
|
||||||
|
|
||||||
const size_t total_len = len * sizeof(char) + 1;
|
const int total_len = len * sizeof(char) + 1;
|
||||||
|
|
||||||
char *slice = malloc(total_len);
|
char *slice = malloc(total_len);
|
||||||
validate_malloc(slice);
|
validate_malloc(slice);
|
||||||
|
|
||||||
|
|
||||||
for (const size_t i = ++a; a < b; a++) {
|
for (const size_t i = ++a; a < b; a++) {
|
||||||
// we don't track i separately but how much has a moved since we started creating the slice
|
// we don't track i separately but how much has 'a' moved since we started creating the slice
|
||||||
slice[a - i] = expression[a];
|
slice[a - i] = expression[a];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,11 +272,13 @@ bool validate_expression(const char *expression) {
|
|||||||
|
|
||||||
charResult validate_char(const char c) {
|
charResult validate_char(const char c) {
|
||||||
if (isdigit(c)) return (charResult){Digit, 0};
|
if (isdigit(c)) return (charResult){Digit, 0};
|
||||||
|
const char *OPERATORS[] = {"+-", "*/", "^", "()"};
|
||||||
|
|
||||||
for (int i = 0; i < sizeof(OPERATORS); i++) {
|
for (int i = 0; i < sizeof(OPERATORS); i++) {
|
||||||
for (int j = 0; j < sizeof(OPERATORS[i]); j++) {
|
for (int j = 0; j < sizeof(OPERATORS[i]); j++) {
|
||||||
if (c == OPERATORS[i][j])
|
if (c == OPERATORS[i][j])
|
||||||
return (charResult){Operator, i};
|
// if the operators are parenthesis return 'invalid' precedence
|
||||||
|
return (charResult){Operator, i == sizeof(OPERATORS) - 1 ? -1 : i};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
21
stack.c
21
stack.c
@@ -15,17 +15,17 @@ stack stack_init(const DataType type, const int len) {
|
|||||||
.len = len,
|
.len = len,
|
||||||
};
|
};
|
||||||
|
|
||||||
const size_t arrLen = len * sizeof(char);
|
const size_t arrLen = len;
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case StringArray:
|
case StringArray:
|
||||||
stack.data.sarr = malloc(arrLen);
|
stack.data.sarr = malloc(arrLen * sizeof(char *));
|
||||||
break;
|
break;
|
||||||
case CharArray:
|
case CharArray:
|
||||||
stack.data.carr = malloc(arrLen);
|
stack.data.carr = malloc(arrLen * sizeof(char));
|
||||||
break;
|
break;
|
||||||
case IntArray:
|
case IntArray:
|
||||||
stack.data.narr = malloc(arrLen);
|
stack.data.narr = malloc(arrLen * sizeof(int));
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "Failed to recognise the DataType for Stack structure");
|
fprintf(stderr, "Failed to recognise the DataType for Stack structure");
|
||||||
exit(1);
|
exit(1);
|
||||||
@@ -106,18 +106,21 @@ stackData stack_pop(stack *stack) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
stackData stack_get(const stack *stack, const int n) {
|
stackData stack_get(const stack *stack, const int n) {
|
||||||
if (stack->i == -1 || n >= stack->len) return (stackData){.ret_code = 1};
|
if (stack->i == -1 || n > stack->i) return (stackData){.ret_code = 1};
|
||||||
stackInput returnData;
|
stackInput returnData;
|
||||||
|
|
||||||
switch (stack->type) {
|
switch (stack->type) {
|
||||||
case StringArray:
|
case StringArray:
|
||||||
returnData.string = stack->data.sarr[stack->i];
|
// todo do not forget to think about freeing memory
|
||||||
|
const size_t len = strlen(stack->data.sarr[n]);
|
||||||
|
returnData.string = malloc(len * sizeof(char) + 1);
|
||||||
|
strcpy(returnData.string, stack->data.sarr[n]);
|
||||||
break;
|
break;
|
||||||
case CharArray:
|
case CharArray:
|
||||||
returnData.ch = stack->data.carr[stack->i];
|
returnData.ch = stack->data.carr[n];
|
||||||
break;
|
break;
|
||||||
case IntArray:
|
case IntArray:
|
||||||
returnData.n = stack->data.narr[stack->i];
|
returnData.n = stack->data.narr[n];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,7 +154,7 @@ void stack_print(const stack *stack, const char *name) {
|
|||||||
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("i location: %d\n", stack->i);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void clear_str_array(const stack *stack) {
|
static void clear_str_array(const stack *stack) {
|
||||||
|
|||||||
1
stack.h
1
stack.h
@@ -21,6 +21,7 @@ typedef struct {
|
|||||||
} data;
|
} data;
|
||||||
|
|
||||||
// if i >= len, the program's guardrails have failed
|
// if i >= len, the program's guardrails have failed
|
||||||
|
// i represents last written array space, len represents the array's length
|
||||||
int i, len;
|
int i, len;
|
||||||
} stack;
|
} stack;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ typedef enum {
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
charType type;
|
charType type;
|
||||||
size_t opPrecedence;
|
int opPrecedence;
|
||||||
} charResult;
|
} charResult;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user