laentropia/Calculator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Made the arrangements for the mentioned changes in the last commit, for now just integers but IT WILL be capable of handling doubles as fractions

Browse Source
This commit is contained in:
Alonso Adrian Martinez Hernandez
2026-03-09 09:23:06 -06:00
parent 771069455d
commit afae8fbe3a
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/lexer.h
View File

@@ -3,10 +3,11 @@
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
// For identifing // For identifing
typedef enum { typedef enum {
NODE_NUMBER, NODE_INTEGER,
NODE_BINARY_OP, NODE_BINARY_OP,
} ASTNodeType; } ASTNodeType;
@@ -41,7 +42,7 @@ typedef enum {
typedef struct ASTNode { typedef struct ASTNode {
ASTNodeType type; ASTNodeType type;
union { union {
double number; int64_t integer;
struct { struct {
struct ASTNode *left; struct ASTNode *left;
struct ASTNode *right; struct ASTNode *right;
@@ -69,7 +70,7 @@ size_t ASTNodeArray_len(ASTNodeArray *arr);
// Lexer funtions as well as few functionality // Lexer funtions as well as few functionality
LexerErr tokenize(const char* input, ASTNodeArray *out); LexerErr tokenize(const char* input, ASTNodeArray *out);
LexerErr tokenize_number(const char* input, size_t *offset, ASTNode *out); LexerErr tokenize_number(const char* input, size_t *offset, ASTNode *out);
LexerErr string_to_number(const char* input, size_t *offset, double *number); LexerErr string_to_number(const char* input, size_t *offset, int64_t *number);
void reverser_string(char* input); void reverser_string(char* input);
#endif // !LEXER_H #endif // !LEXER_H

6
src/lexer.c
View File

@@ -114,7 +114,7 @@ size_t ASTNodeArray_len(ASTNodeArray *arr) {
// CURRENTLY, it only supports ints, not clear how floating // CURRENTLY, it only supports ints, not clear how floating
// point is implemented but i'll figure it out // point is implemented but i'll figure it out
LexerErr string_to_number(const char *input, size_t *offset, double *number) { LexerErr string_to_number(const char *input, size_t *offset, int64_t *number) {
char buf[128] = { '\0' }; char buf[128] = { '\0' };
size_t buf_pos = 0; size_t buf_pos = 0;
@@ -130,7 +130,7 @@ LexerErr string_to_number(const char *input, size_t *offset, double *number) {
} }
int c = 0; int c = 0;
long count = 0; int64_t count = 0;
while (buf[c] != '\0') { while (buf[c] != '\0') {
int digit = buf[c] - '0'; int digit = buf[c] - '0';
@@ -144,7 +144,7 @@ LexerErr string_to_number(const char *input, size_t *offset, double *number) {
c++; c++;
} }
*number = (double) count; *number = count;
*offset = current; *offset = current;
return LEXER_OK; return LEXER_OK;
} }

28
test/test_ASTNodeArray.c
View File

@@ -12,18 +12,18 @@ static void test_array_push(void **state) {
// We use 2 to force resize and checking anything wrong with malloc // We use 2 to force resize and checking anything wrong with malloc
ASTNodeArray arr = ASTNodeArray_init(2); ASTNodeArray arr = ASTNodeArray_init(2);
ASTNode node1 = { ASTNode node1 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 90 } .data = { .integer = 90 }
}; };
ASTNode node2 = { ASTNode node2 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 80 } .data = { .integer = 80 }
}; };
ASTNode node3 = { ASTNode node3 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 70 } .data = { .integer = 70 }
}; };
assert_int_equal(ASTNodeArray_push(&arr, node1), ARRAY_OK); assert_int_equal(ASTNodeArray_push(&arr, node1), ARRAY_OK);
@@ -44,18 +44,18 @@ static void test_array_pop(void **state) {
// Set to force desize // Set to force desize
ASTNodeArray arr = ASTNodeArray_init(16); ASTNodeArray arr = ASTNodeArray_init(16);
ASTNode node1 = { ASTNode node1 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 90 } .data = { .integer = 90 }
}; };
ASTNode node2 = { ASTNode node2 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 80 } .data = { .integer = 80 }
}; };
ASTNode node3 = { ASTNode node3 = {
.type = NODE_NUMBER, .type = NODE_INTEGER,
.data = { .number = 70 } .data = { .integer = 70 }
}; };
assert_int_equal(ASTNodeArray_push(&arr, node1), ARRAY_OK); assert_int_equal(ASTNodeArray_push(&arr, node1), ARRAY_OK);
@@ -69,8 +69,8 @@ static void test_array_pop(void **state) {
ASTNode node4; ASTNode node4;
assert_int_equal(ASTNodeArray_pop(&arr, 1, &node4), ARRAY_OK); assert_int_equal(ASTNodeArray_pop(&arr, 1, &node4), ARRAY_OK);
assert_int_equal(node4.type, NODE_NUMBER); assert_int_equal(node4.type, NODE_INTEGER);
assert_int_equal(node4.data.number, 80); assert_int_equal(node4.data.integer, 80);
ASTNodeArray_free(&arr); ASTNodeArray_free(&arr);
} }

2
test/test_lexer.c
View File

@@ -11,7 +11,7 @@ static void test_string_to_number(void **state) {
char num[16] = "2333t55"; char num[16] = "2333t55";
size_t offset = 0; size_t offset = 0;
double result = 0; int64_t result = 0;
assert_int_equal(string_to_number(num, &offset, &result), 0); assert_int_equal(string_to_number(num, &offset, &result), 0);
assert_int_equal(offset, 4); assert_int_equal(offset, 4);