jacob/scl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Maybe fixed some memory leaks.

Browse Source 
I don't know cauase lsan isn't working.
This commit is contained in:
Jacob Signorovitch 2025-02-04 17:55:47 -05:00
parent 408a5a46c0
commit 6cbc28e092
5 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ TEST_OBJ_DIR = $(TEST_BUILD_DIR)/obj
CC = clang
LINK = clang
CFLAGS = -Wall -DDBG -ggdb
CFLAGS = -Wall -DDBG -ggdb -fsanitize=leak
LDFLAGS = -lm
BATS = bats
BISON = bison

96
src/exec.c
View File

@ -4,15 +4,14 @@
#include "include/ast.h"
#include "include/exec.h"
#include "include/htab.h"
#include "include/stack.h"
#include "include/util.h"
#include "include/htab.h"
extern AST* root;
ASTNumData exec_start(AST* ast) {
// The `Stack` of `HTab` that makes up the scope of any given `AST`.
Stack* scope = stack_init();
scope = stack_init();
// Global scope. Just dummy values for testing.
HTab* global = htab_init();
@ -20,11 +19,16 @@ ASTNumData exec_start(AST* ast) {
// n = 42.02
char* name = malloc(2); // TODO: Write a macro for this pattern.
strcpy(name, "n");
AST* n = ast_init(AST_TYPE_VDEF, ast_vdef_data_init(name,
ast_init(AST_TYPE_NUM, ast_num_data_init(42.02))
));
AST* n = ast_init(
AST_TYPE_VDEF,
ast_vdef_data_init(
name, ast_init(AST_TYPE_NUM, ast_num_data_init(42.02))
)
);
htab_ins(global, ((ASTVDefData*)n->data)->name, ((ASTVDefData*)n->data)->val);
htab_ins(
global, ((ASTVDefData*)n->data)->name, ((ASTVDefData*)n->data)->val
);
// Push global namespace to `scope`.
stack_push(scope, global);
@ -36,21 +40,19 @@ ASTNumData exec_exp(AST* ast, Stack* scope) {
log_dbg("Started execution.");
switch (ast->type) {
case AST_TYPE_BLOCK: return exec_block(ast, scope);
case AST_TYPE_CALL: return exec_call(ast, scope);
case AST_TYPE_NUM: return *(ASTNumData*)ast->data;
case AST_TYPE_VREF: return exec_vref(ast, scope);
case AST_TYPE_VDEF: return exec_vdef(ast, scope);
default: printf("what\n");
exit(1);
case AST_TYPE_CALL: return exec_call(ast, scope);
case AST_TYPE_NUM: return *(ASTNumData*)ast->data;
case AST_TYPE_VREF: return exec_vref(ast, scope);
case AST_TYPE_VDEF: return exec_vdef(ast, scope);
default: printf("what\n"); exit(1);
}
}
ASTNumData exec_block(AST* ast, Stack* scope) {
ASTBlockData* block = (ASTBlockData*) ast->data;
ASTBlockData* block = (ASTBlockData*)ast->data;
// Loop through all but last ast.
for (int i = 0; i < block->ln - 1; i++)
exec_exp(block->inside[i], scope);
for (int i = 0; i < block->ln - 1; i++) exec_exp(block->inside[i], scope);
return exec_exp(block->inside[block->ln - 1], scope);
}
@ -60,52 +62,41 @@ ASTNumData exec_call(AST* ast, Stack* scope) {
fflush(stdout);
ASTCallData* calldata = (ASTCallData*)ast->data;
if (calldata->argc >= 1) {
if (!strcmp(calldata->to, "sum")) {
double total = exec_exp(calldata->argv[0], scope);
if (!strcmp(calldata->to, "sum")) {
double total = exec_exp(calldata->argv[0], scope);
for (
size_t i = 1;
i < calldata->argc;
total += exec_exp(calldata->argv[i++], scope)
);
for (size_t i = 1; i < calldata->argc;
total += exec_exp(calldata->argv[i++], scope));
return total;
} else if (!strcmp(calldata->to, "sub")) {
double total = exec_exp(calldata->argv[0], scope);
return total;
} else if (!strcmp(calldata->to, "sub")) {
double total = exec_exp(calldata->argv[0], scope);
for (
size_t i = 1;
i < calldata->argc;
total -= exec_exp(calldata->argv[i++], scope)
);
for (size_t i = 1; i < calldata->argc;
total -= exec_exp(calldata->argv[i++], scope));
return total;
} else if (!strcmp(calldata->to, "mul")) {
double total = exec_exp(calldata->argv[0], scope);
return total;
} else if (!strcmp(calldata->to, "mul")) {
double total = exec_exp(calldata->argv[0], scope);
for (
size_t i = 1;
i < calldata->argc;
total *= exec_exp(calldata->argv[i++], scope)
);
for (size_t i = 1; i < calldata->argc;
total *= exec_exp(calldata->argv[i++], scope));
return total;
} else if (!strcmp(calldata->to, "div")) {
double total = exec_exp(calldata->argv[0], scope);
return total;
} else if (!strcmp(calldata->to, "div")) {
double total = exec_exp(calldata->argv[0], scope);
for (
size_t i = 1;
i < calldata->argc;
total /= exec_exp(calldata->argv[i++], scope)
);
for (size_t i = 1; i < calldata->argc;
total /= exec_exp(calldata->argv[i++], scope));
return total;
}}
return total;
}
}
return -1000;
}
ASTNumData exec_vdef(AST* ast, Stack* scope) {
ASTVDefData* data = (ASTVDefData*) ast->data;
ASTVDefData* data = (ASTVDefData*)ast->data;
AST* val = data->val;
char* key = data->name;
htab_ins(scope->val[0], key, val);
@ -114,13 +105,14 @@ ASTNumData exec_vdef(AST* ast, Stack* scope) {
ASTNumData exec_vref(AST* ast, Stack* scope) {
log_dbg("attempting to reference var");
ASTVrefData* vref = (ASTVrefData*) ast->data;
ASTVrefData* vref = (ASTVrefData*)ast->data;
char* key = vref->to;
AST* val;
val = htab_get(scope->val[0], key);
if (val != NULL) return exec_exp(val, scope); else log_dbg("didn't find def");
if (val != NULL) return exec_exp(val, scope);
else log_dbg("didn't find def");
return *ast_num_data_init(101.0);
}

2
src/grammar.y
View File

@ -85,7 +85,7 @@ input:
inputend:
%empty
| input {
root = ast_init(AST_TYPE_BLOCK, ast_block_data_init($1->buf, $1->ln));
root = ast_init(AST_TYPE_BLOCK, ast_block_data_init((AST**) $1->buf, $1->ln));
}
;

2
src/include/exec.h
View File

@ -4,6 +4,8 @@
#include "ast.h"
#include "stack.h"
// The `Stack` of `HTab` that makes up the scope of any given `AST`.
extern Stack* scope;
// Start executing at the root of the AST. Initialize the `scope`.
ASTNumData exec_start(AST* ast);

19
src/main.c
View File

@ -1,11 +1,13 @@
#include <stdio.h>
#include <string.h>
#include "include/global.h"
#include "include/ast.h"
#include "include/dstr.h"
#include "include/exec.h"
#include "include/global.h"
#include "include/htab.h"
#include "include/lexer.h"
#include "include/stack.h"
#include "include/util.h"
#include "../build/grammars/grammar.tab.h"
@ -15,11 +17,16 @@ extern AST* root;
extern char* inp;
extern int yyparse();
Stack* scope;
int main(int argc, char** argv) {
if (argc - 1 && strlen(argv[1]) > 0 && (inp = argv[1]) && !yyparse()) {
log_dbg("Parsed successfully!\n");
exec_print(exec_start(root));
HTab* global = stack_pop(scope);
htab_destroy(global);
stack_destroy(scope);
ast_destroy(root);
exit(0);
}
@ -51,11 +58,15 @@ int main(int argc, char** argv) {
log_dbg("Parsed successfully!\n");
} else printf("Parse error.\n");
#ifdef DBG
ast_print(root);
#endif
#ifdef DBG
ast_print(root);
#endif
exec_print(exec_start(root));
HTab* global = stack_pop(scope);
htab_destroy(global);
stack_destroy(scope);
ast_destroy(root);
}