Merge remote-tracking branch 'origin/90-implement-the-struct-tree-for-the-parser' into 90-implement-the-struct-tree-for-the-parser
# Conflicts: # src/set/set.c # src/set/types.c
This commit is contained in:
commit
bfd3040df4
|
@ -183,7 +183,7 @@ void print_help(void) {
|
||||||
" --debug print debug logs (if not disabled at compile time)",
|
" --debug print debug logs (if not disabled at compile time)",
|
||||||
" --version print the version",
|
" --version print the version",
|
||||||
" --help print this hel dialog",
|
" --help print this hel dialog",
|
||||||
" --print-memory-stats print statistics of the garbage collector"
|
" --print-gc-stats print statistics of the garbage collector"
|
||||||
};
|
};
|
||||||
|
|
||||||
for (unsigned int i = 0; i < sizeof(lines) / sizeof(const char *); i++) {
|
for (unsigned int i = 0; i < sizeof(lines) / sizeof(const char *); i++) {
|
||||||
|
|
|
@ -146,8 +146,6 @@ static void build_target(ModuleFileStack *unit, const TargetConfig *target) {
|
||||||
|
|
||||||
// TODO: parse AST to semantic values
|
// TODO: parse AST to semantic values
|
||||||
// TODO: backend codegen
|
// TODO: backend codegen
|
||||||
|
|
||||||
delete_set(test);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
run_compiler();
|
run_compiler();
|
||||||
|
|
||||||
if (is_option_set("print-memory-stats")) {
|
if (is_option_set("print-gc-stats")) {
|
||||||
print_memory_statistics();
|
print_memory_statistics();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
102
src/mem/cache.c
102
src/mem/cache.c
|
@ -7,6 +7,7 @@
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <cfg/opt.h>
|
||||||
|
|
||||||
static GHashTable* namespaces = NULL;
|
static GHashTable* namespaces = NULL;
|
||||||
|
|
||||||
|
@ -20,6 +21,17 @@ typedef struct MemoryNamespaceStatistic_t {
|
||||||
size_t purged_free_count;
|
size_t purged_free_count;
|
||||||
} MemoryNamespaceStatistic;
|
} MemoryNamespaceStatistic;
|
||||||
|
|
||||||
|
typedef enum MemoryBlockType_t {
|
||||||
|
GenericBlock,
|
||||||
|
GLIB_Array,
|
||||||
|
GLIB_HashTable
|
||||||
|
} MemoryBlockType;
|
||||||
|
|
||||||
|
typedef struct MemoryBlock_t {
|
||||||
|
void* block_ptr;
|
||||||
|
MemoryBlockType kind;
|
||||||
|
} MemoryBlock;
|
||||||
|
|
||||||
typedef struct MemoryNamespace_t {
|
typedef struct MemoryNamespace_t {
|
||||||
MemoryNamespaceStatistic statistic;
|
MemoryNamespaceStatistic statistic;
|
||||||
GArray* blocks;
|
GArray* blocks;
|
||||||
|
@ -44,9 +56,11 @@ static void* namespace_malloc(MemoryNamespaceRef memoryNamespace, size_t size) {
|
||||||
assert(memoryNamespace != NULL);
|
assert(memoryNamespace != NULL);
|
||||||
assert(size != 0);
|
assert(size != 0);
|
||||||
|
|
||||||
void* block = malloc(size);
|
MemoryBlock block;
|
||||||
|
block.block_ptr = malloc(size);
|
||||||
|
block.kind = GenericBlock;
|
||||||
|
|
||||||
if (block == NULL) {
|
if (block.block_ptr == NULL) {
|
||||||
memoryNamespace->statistic.faulty_allocations ++;
|
memoryNamespace->statistic.faulty_allocations ++;
|
||||||
} else {
|
} else {
|
||||||
g_array_append_val(memoryNamespace->blocks, block);
|
g_array_append_val(memoryNamespace->blocks, block);
|
||||||
|
@ -55,20 +69,36 @@ static void* namespace_malloc(MemoryNamespaceRef memoryNamespace, size_t size) {
|
||||||
memoryNamespace->statistic.bytes_allocated += size;
|
memoryNamespace->statistic.bytes_allocated += size;
|
||||||
}
|
}
|
||||||
|
|
||||||
return block;
|
return block.block_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void namespace_free_block(MemoryBlock block) {
|
||||||
|
switch (block.kind) {
|
||||||
|
case GenericBlock:
|
||||||
|
free(block.block_ptr);
|
||||||
|
break;
|
||||||
|
case GLIB_Array:
|
||||||
|
g_array_free(block.block_ptr, TRUE);
|
||||||
|
break;
|
||||||
|
case GLIB_HashTable:
|
||||||
|
g_hash_table_destroy(block.block_ptr);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean namespace_free(MemoryNamespaceRef memoryNamespace, void* block) {
|
static gboolean namespace_free(MemoryNamespaceRef memoryNamespace, void* block) {
|
||||||
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
||||||
void* current_block = g_array_index(memoryNamespace->blocks, void*, i);
|
MemoryBlock current_block = g_array_index(memoryNamespace->blocks, MemoryBlock, i);
|
||||||
|
|
||||||
if (current_block == block) {
|
if (current_block.block_ptr == block) {
|
||||||
assert(block != NULL);
|
assert(block != NULL);
|
||||||
|
|
||||||
free(block);
|
namespace_free_block(current_block);
|
||||||
|
|
||||||
g_array_remove_index(memoryNamespace->blocks, i);
|
g_array_remove_index(memoryNamespace->blocks, i);
|
||||||
|
|
||||||
memoryNamespace->statistic.manual_free_count++;
|
memoryNamespace->statistic.manual_free_count++;
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,13 +109,13 @@ static void* namespace_realloc(MemoryNamespaceRef memoryNamespace, void* block,
|
||||||
void* reallocated_block = NULL;
|
void* reallocated_block = NULL;
|
||||||
|
|
||||||
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
||||||
void* current_block = g_array_index(memoryNamespace->blocks, void*, i);
|
MemoryBlock current_block = g_array_index(memoryNamespace->blocks, MemoryBlock, i);
|
||||||
|
|
||||||
if (current_block == block) {
|
if (current_block.block_ptr == block) {
|
||||||
reallocated_block = realloc(block, size);
|
reallocated_block = realloc(current_block.block_ptr, size);
|
||||||
|
|
||||||
if (reallocated_block != NULL) {
|
if (reallocated_block != NULL) {
|
||||||
g_array_index(memoryNamespace->blocks, void*, i) = reallocated_block;
|
g_array_index(memoryNamespace->blocks, MemoryBlock, i).block_ptr = reallocated_block;
|
||||||
memoryNamespace->statistic.bytes_allocated += size;
|
memoryNamespace->statistic.bytes_allocated += size;
|
||||||
memoryNamespace->statistic.reallocation_count ++;
|
memoryNamespace->statistic.reallocation_count ++;
|
||||||
} else {
|
} else {
|
||||||
|
@ -107,9 +137,9 @@ static void namespace_delete(MemoryNamespaceRef memoryNamespace) {
|
||||||
static void namespace_purge(MemoryNamespaceRef memoryNamespace) {
|
static void namespace_purge(MemoryNamespaceRef memoryNamespace) {
|
||||||
|
|
||||||
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
for (guint i = 0; i < memoryNamespace->blocks->len; i++) {
|
||||||
void* current_block = g_array_index(memoryNamespace->blocks, void*, i);
|
MemoryBlock current_block = g_array_index(memoryNamespace->blocks, MemoryBlock, i);
|
||||||
|
|
||||||
free(current_block);
|
namespace_free_block(current_block);
|
||||||
|
|
||||||
memoryNamespace->statistic.purged_free_count ++;
|
memoryNamespace->statistic.purged_free_count ++;
|
||||||
}
|
}
|
||||||
|
@ -120,7 +150,7 @@ static void namespace_purge(MemoryNamespaceRef memoryNamespace) {
|
||||||
static MemoryNamespaceRef namespace_new() {
|
static MemoryNamespaceRef namespace_new() {
|
||||||
MemoryNamespaceRef memoryNamespace = malloc(sizeof(MemoryNamespace));
|
MemoryNamespaceRef memoryNamespace = malloc(sizeof(MemoryNamespace));
|
||||||
|
|
||||||
memoryNamespace->blocks = g_array_new(FALSE, FALSE, sizeof(void*));
|
memoryNamespace->blocks = g_array_new(FALSE, FALSE, sizeof(MemoryBlock));
|
||||||
memoryNamespace->statistic.bytes_allocated = 0;
|
memoryNamespace->statistic.bytes_allocated = 0;
|
||||||
memoryNamespace->statistic.allocation_count = 0;
|
memoryNamespace->statistic.allocation_count = 0;
|
||||||
memoryNamespace->statistic.manual_free_count = 0;
|
memoryNamespace->statistic.manual_free_count = 0;
|
||||||
|
@ -132,6 +162,30 @@ static MemoryNamespaceRef namespace_new() {
|
||||||
return memoryNamespace;
|
return memoryNamespace;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GArray *namespace_new_g_array(MemoryNamespaceRef namespace, guint size) {
|
||||||
|
MemoryBlock block;
|
||||||
|
block.block_ptr = g_array_new(FALSE, FALSE, size);
|
||||||
|
block.kind = GLIB_Array;
|
||||||
|
|
||||||
|
g_array_append_val(namespace->blocks, block);
|
||||||
|
namespace->statistic.bytes_allocated += sizeof(GArray*);
|
||||||
|
namespace->statistic.allocation_count ++;
|
||||||
|
|
||||||
|
return block.block_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
GHashTable *namespace_new_g_hash_table(MemoryNamespaceRef namespace, GHashFunc hash_func, GEqualFunc key_equal_func) {
|
||||||
|
MemoryBlock block;
|
||||||
|
block.block_ptr = g_hash_table_new(hash_func, key_equal_func);
|
||||||
|
block.kind = GLIB_HashTable;
|
||||||
|
|
||||||
|
g_array_append_val(namespace->blocks, block);
|
||||||
|
namespace->statistic.bytes_allocated += sizeof(GHashTable*);
|
||||||
|
namespace->statistic.allocation_count ++;
|
||||||
|
|
||||||
|
return block.block_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
static void cleanup() {
|
static void cleanup() {
|
||||||
if (namespaces == NULL) {
|
if (namespaces == NULL) {
|
||||||
printf("==> Memory cache was unused <==\n");
|
printf("==> Memory cache was unused <==\n");
|
||||||
|
@ -267,5 +321,25 @@ void print_memory_statistics() {
|
||||||
|
|
||||||
namespace_statistics_print(&total, "summary");
|
namespace_statistics_print(&total, "summary");
|
||||||
|
|
||||||
printf("Note: untracked are memory allocations from external libraries.\n");
|
printf("Note: untracked are memory allocations from external libraries and non-gc managed components.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
GArray* mem_new_g_array(MemoryNamespaceName name, guint element_size) {
|
||||||
|
MemoryNamespaceRef cache = check_namespace(name);
|
||||||
|
|
||||||
|
if (cache == NULL) {
|
||||||
|
PANIC("memory namespace not created");
|
||||||
|
}
|
||||||
|
|
||||||
|
return namespace_new_g_array(cache, element_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
GHashTable* mem_new_g_hash_table(MemoryNamespaceName name, GHashFunc hash_func, GEqualFunc key_equal_func) {
|
||||||
|
MemoryNamespaceRef cache = check_namespace(name);
|
||||||
|
|
||||||
|
if (cache == NULL) {
|
||||||
|
PANIC("memory namespace not created");
|
||||||
|
}
|
||||||
|
|
||||||
|
return namespace_new_g_hash_table(cache, hash_func, key_equal_func);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include <mem/cache.h>
|
#include <mem/cache.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
typedef char* MemoryNamespaceName;
|
typedef char* MemoryNamespaceName;
|
||||||
|
|
||||||
|
@ -86,4 +87,8 @@ void* mem_clone(MemoryNamespaceName name, void* data, size_t size);
|
||||||
|
|
||||||
void print_memory_statistics();
|
void print_memory_statistics();
|
||||||
|
|
||||||
|
GArray* mem_new_g_array(MemoryNamespaceName name, guint element_size);
|
||||||
|
|
||||||
|
GHashTable* mem_new_g_hash_table(MemoryNamespaceName name, GHashFunc hash_func, GEqualFunc key_equal_func);
|
||||||
|
|
||||||
#endif //GEMSTONE_CACHE_H
|
#endif //GEMSTONE_CACHE_H
|
||||||
|
|
234
src/set/set.c
234
src/set/set.c
|
@ -18,82 +18,6 @@ static GHashTable *declaredBoxes = NULL;//pointer to typeboxes
|
||||||
static GHashTable *functionParameter = NULL;
|
static GHashTable *functionParameter = NULL;
|
||||||
static GArray *Scope = NULL;//list of hashtables. last Hashtable is current depth of program. hashtable key: ident, value: Variable* to var
|
static GArray *Scope = NULL;//list of hashtables. last Hashtable is current depth of program. hashtable key: ident, value: Variable* to var
|
||||||
|
|
||||||
static void delete_declared_composites() {
|
|
||||||
if (declaredComposites == NULL) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
Type* type = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, declaredComposites);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&type)) {
|
|
||||||
delete_type(type);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(declaredComposites);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_declared_boxes() {
|
|
||||||
if (declaredBoxes == NULL) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
Type* type = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, declaredBoxes);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&type)) {
|
|
||||||
delete_type(type);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(declaredBoxes);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_scopes() {
|
|
||||||
if (Scope == NULL) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (guint i = 0; i < Scope->len; i++) {
|
|
||||||
GHashTable* scope = g_array_index(Scope, GHashTable*, i);
|
|
||||||
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
Variable* variable = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, scope);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&variable)) {
|
|
||||||
delete_variable(variable);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(scope);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_array_free(Scope, TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_set(Module* module) {
|
|
||||||
assert(module != NULL);
|
|
||||||
assert(declaredBoxes != NULL);
|
|
||||||
assert(declaredComposites != NULL);
|
|
||||||
assert(functionParameter != NULL);
|
|
||||||
|
|
||||||
delete_module(module);
|
|
||||||
|
|
||||||
delete_declared_composites();
|
|
||||||
delete_declared_boxes();
|
|
||||||
delete_scopes();
|
|
||||||
}
|
|
||||||
|
|
||||||
const Type ShortShortUnsingedIntType = {
|
const Type ShortShortUnsingedIntType = {
|
||||||
.kind = TypeKindComposite,
|
.kind = TypeKindComposite,
|
||||||
.impl = {
|
.impl = {
|
||||||
|
@ -124,13 +48,15 @@ int sign_from_string(const char* string, Sign* sign) {
|
||||||
|
|
||||||
if (strcmp(string, "unsigned") == 0) {
|
if (strcmp(string, "unsigned") == 0) {
|
||||||
*sign = Unsigned;
|
*sign = Unsigned;
|
||||||
return 0;
|
return SEMANTIC_OK;
|
||||||
} else if (strcmp(string, "signed") == 0) {
|
|
||||||
*sign = Signed;
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1;
|
if (strcmp(string, "signed") == 0) {
|
||||||
|
*sign = Signed;
|
||||||
|
return SEMANTIC_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -179,10 +105,12 @@ int check_scale_factor(AST_NODE_PTR node, Scale scale) {
|
||||||
print_diagnostic(current_file, &node->location, Error, "Composite scale overflow");
|
print_diagnostic(current_file, &node->location, Error, "Composite scale overflow");
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0.25 > scale) {
|
if (0.25 > scale) {
|
||||||
print_diagnostic(current_file, &node->location, Error, "Composite scale underflow");
|
print_diagnostic(current_file, &node->location, Error, "Composite scale underflow");
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,7 +246,6 @@ int get_type_impl(AST_NODE_PTR currentNode, Type** type) {
|
||||||
//TODO change composite based on other nodes
|
//TODO change composite based on other nodes
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (g_hash_table_contains(declaredBoxes, typekind) == TRUE) {
|
if (g_hash_table_contains(declaredBoxes, typekind) == TRUE) {
|
||||||
*type = g_hash_table_lookup(declaredBoxes, typekind);
|
*type = g_hash_table_lookup(declaredBoxes, typekind);
|
||||||
if(currentNode->child_count > 1) {
|
if(currentNode->child_count > 1) {
|
||||||
|
@ -354,8 +281,6 @@ int get_type_impl(AST_NODE_PTR currentNode, Type** type) {
|
||||||
status = impl_composite_type(currentNode, &new_type->impl.composite);
|
status = impl_composite_type(currentNode, &new_type->impl.composite);
|
||||||
*type = new_type;
|
*type = new_type;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -371,6 +296,7 @@ StorageQualifier Qualifier_from_string(const char *str) {
|
||||||
|
|
||||||
PANIC("Provided string is not a storagequalifier: %s", str);
|
PANIC("Provided string is not a storagequalifier: %s", str);
|
||||||
}
|
}
|
||||||
|
|
||||||
int addVarToScope(Variable *variable);
|
int addVarToScope(Variable *variable);
|
||||||
|
|
||||||
int createRef(AST_NODE_PTR currentNode, Type** reftype) {
|
int createRef(AST_NODE_PTR currentNode, Type** reftype) {
|
||||||
|
@ -401,7 +327,7 @@ int createDecl(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
|
|
||||||
AST_NODE_PTR ident_list = currentNode->children[currentNode->child_count - 1];
|
AST_NODE_PTR ident_list = currentNode->children[currentNode->child_count - 1];
|
||||||
|
|
||||||
*variables = g_array_new(FALSE, FALSE, sizeof(Variable*));
|
*variables = mem_new_g_array(MemoryNamespaceSet, sizeof(Variable *));
|
||||||
|
|
||||||
VariableDeclaration decl;
|
VariableDeclaration decl;
|
||||||
decl.nodePtr = currentNode;
|
decl.nodePtr = currentNode;
|
||||||
|
@ -462,8 +388,7 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
AST_NODE_PTR expression = currentNode->children[1];
|
AST_NODE_PTR expression = currentNode->children[1];
|
||||||
AST_NODE_PTR ident_list = declaration->children[currentNode->child_count - 1];
|
AST_NODE_PTR ident_list = declaration->children[currentNode->child_count - 1];
|
||||||
|
|
||||||
|
*variables = mem_new_g_array(MemoryNamespaceSet, sizeof(Variable *));
|
||||||
*variables = g_array_new(FALSE, FALSE, sizeof(Variable*));
|
|
||||||
|
|
||||||
VariableDeclaration decl;
|
VariableDeclaration decl;
|
||||||
VariableDefiniton def;
|
VariableDefiniton def;
|
||||||
|
@ -499,7 +424,6 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
}
|
}
|
||||||
def.initializer = name;
|
def.initializer = name;
|
||||||
|
|
||||||
|
|
||||||
for (size_t i = 0; i < ident_list->child_count; i++) {
|
for (size_t i = 0; i < ident_list->child_count; i++) {
|
||||||
Variable *variable = mem_alloc(MemoryNamespaceSet, sizeof(Variable));
|
Variable *variable = mem_alloc(MemoryNamespaceSet, sizeof(Variable));
|
||||||
|
|
||||||
|
@ -507,9 +431,10 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
variable->nodePtr = currentNode;
|
variable->nodePtr = currentNode;
|
||||||
variable->name = ident_list->children[i]->value;
|
variable->name = ident_list->children[i]->value;
|
||||||
variable->impl.definiton = def;
|
variable->impl.definiton = def;
|
||||||
|
|
||||||
g_array_append_val(*variables, variable);
|
g_array_append_val(*variables, variable);
|
||||||
int signal = addVarToScope(variable);
|
|
||||||
if (signal){
|
if (addVarToScope(variable) == SEMANTIC_ERROR) {
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -517,38 +442,6 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
//int: a,b,c = 5
|
|
||||||
//
|
|
||||||
//GArray.data:
|
|
||||||
// 1. Variable
|
|
||||||
// kind = VariableKindDefinition;
|
|
||||||
// name = a;
|
|
||||||
// impl.definition:
|
|
||||||
// initilizer:
|
|
||||||
// createExpression(...)
|
|
||||||
// decl:
|
|
||||||
// qulifier:
|
|
||||||
// type:
|
|
||||||
// pointer
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// 2. Variable
|
|
||||||
// kind = VariableKindDefinition;
|
|
||||||
// name = b;
|
|
||||||
// impl.definition:
|
|
||||||
// initilizer: 5
|
|
||||||
// decl:
|
|
||||||
// qulifier:
|
|
||||||
// type:
|
|
||||||
// pointer
|
|
||||||
// .
|
|
||||||
// .
|
|
||||||
// .
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int getVariableFromScope(const char *name, Variable **variable) {
|
int getVariableFromScope(const char *name, Variable **variable) {
|
||||||
assert(name != NULL);
|
assert(name != NULL);
|
||||||
assert(variable != NULL);
|
assert(variable != NULL);
|
||||||
|
@ -1104,31 +997,48 @@ int createBitNotOperation(Expression* ParentExpression, AST_NODE_PTR currentNode
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Return a copy of all BoxMembers specified by their name in names from a boxes type
|
||||||
|
* Will run recursively in case the first name refers to a subbox
|
||||||
|
* @param currentBoxType
|
||||||
|
* @param names
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
GArray *getBoxMember(Type *currentBoxType, GArray *names) {
|
GArray *getBoxMember(Type *currentBoxType, GArray *names) {
|
||||||
|
|
||||||
GArray *members = g_array_new(FALSE, FALSE, sizeof(BoxMember));
|
GArray *members = mem_new_g_array(MemoryNamespaceSet, sizeof(BoxMember));
|
||||||
|
// list of members of the type
|
||||||
GHashTable *memberList = currentBoxType->impl.box->member;
|
GHashTable *memberList = currentBoxType->impl.box->member;
|
||||||
|
|
||||||
|
// name of member to extract
|
||||||
const char *currentName = g_array_index(names, const char *, 0);
|
const char *currentName = g_array_index(names, const char *, 0);
|
||||||
if(!g_hash_table_contains(memberList, currentName)) {
|
// look for member of this name
|
||||||
// TODO: free members
|
if (g_hash_table_contains(memberList, currentName)) {
|
||||||
return NULL;
|
|
||||||
}
|
// get member and store in array
|
||||||
BoxMember *currentMember = g_hash_table_lookup(memberList, currentName);
|
BoxMember *currentMember = g_hash_table_lookup(memberList, currentName);
|
||||||
g_array_append_val(members, currentMember);
|
g_array_append_val(members, currentMember);
|
||||||
|
|
||||||
|
// last name in list, return
|
||||||
g_array_remove_index(names, 0);
|
g_array_remove_index(names, 0);
|
||||||
if (names->len == 0) {
|
if (names->len == 0) {
|
||||||
return members;
|
return members;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// other names may refer to members of child boxes
|
||||||
if (currentMember->type->kind == TypeKindBox) {
|
if (currentMember->type->kind == TypeKindBox) {
|
||||||
GArray *otherMember = getBoxMember(currentMember->type, names);
|
GArray *otherMember = getBoxMember(currentMember->type, names);
|
||||||
|
|
||||||
if (NULL == otherMember) {
|
if (NULL == otherMember) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_array_append_vals(members, (BoxMember *) otherMember->data, otherMember->len);
|
g_array_append_vals(members, (BoxMember *) otherMember->data, otherMember->len);
|
||||||
|
|
||||||
return members;
|
return members;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1207,13 +1117,6 @@ int createTypeCast(Expression* ParentExpression, AST_NODE_PTR currentNode){
|
||||||
print_diagnostic(current_file, ¤tNode->children[1]->location, Error, "Unknown type");
|
print_diagnostic(current_file, ¤tNode->children[1]->location, Error, "Unknown type");
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target->kind != TypeKindComposite
|
|
||||||
&& target->kind != TypeKindPrimitive){
|
|
||||||
//TODO free everything
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
ParentExpression->impl.typecast.targetType = target;
|
ParentExpression->impl.typecast.targetType = target;
|
||||||
ParentExpression->result = target;
|
ParentExpression->result = target;
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
|
@ -1227,18 +1130,6 @@ int createTransmute(Expression* ParentExpression, AST_NODE_PTR currentNode){
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
//cand cast from box
|
|
||||||
if (ParentExpression->impl.transmute.operand->result->kind == TypeKindBox){
|
|
||||||
//TODO free everything
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
Type * inputExpressionType = ParentExpression->impl.transmute.operand->result;
|
|
||||||
double inputSize = 1;
|
|
||||||
if(inputExpressionType->kind == TypeKindComposite) {
|
|
||||||
inputSize= inputExpressionType->impl.composite.scale;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Type* target = mem_alloc(MemoryNamespaceSet,sizeof(Type));
|
Type* target = mem_alloc(MemoryNamespaceSet,sizeof(Type));
|
||||||
int status = get_type_impl(currentNode->children[1], &target);
|
int status = get_type_impl(currentNode->children[1], &target);
|
||||||
if (status){
|
if (status){
|
||||||
|
@ -1246,22 +1137,6 @@ int createTransmute(Expression* ParentExpression, AST_NODE_PTR currentNode){
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target->kind != TypeKindComposite
|
|
||||||
&& target->kind != TypeKindPrimitive){
|
|
||||||
//TODO free everything
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
double targetSize = 1;
|
|
||||||
if(target->kind == TypeKindComposite) {
|
|
||||||
targetSize = target->impl.composite.scale;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(inputSize != targetSize) {
|
|
||||||
//TODO free everything
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
ParentExpression->impl.typecast.targetType = target;
|
ParentExpression->impl.typecast.targetType = target;
|
||||||
ParentExpression->result = target;
|
ParentExpression->result = target;
|
||||||
|
|
||||||
|
@ -1337,8 +1212,8 @@ Expression *createExpression(AST_NODE_PTR currentNode){
|
||||||
DEBUG("create Expression");
|
DEBUG("create Expression");
|
||||||
Expression *expression = mem_alloc(MemoryNamespaceSet,sizeof(Expression));
|
Expression *expression = mem_alloc(MemoryNamespaceSet,sizeof(Expression));
|
||||||
expression->nodePtr = currentNode;
|
expression->nodePtr = currentNode;
|
||||||
switch(currentNode->kind){
|
|
||||||
|
|
||||||
|
switch (currentNode->kind) {
|
||||||
case AST_Int:
|
case AST_Int:
|
||||||
case AST_Float:
|
case AST_Float:
|
||||||
expression->kind = ExpressionKindConstant;
|
expression->kind = ExpressionKindConstant;
|
||||||
|
@ -1423,7 +1298,6 @@ Expression *createExpression(AST_NODE_PTR currentNode){
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case AST_IdentList:
|
case AST_IdentList:
|
||||||
case AST_List:
|
case AST_List:
|
||||||
expression->kind = ExpressionKindVariable;
|
expression->kind = ExpressionKindVariable;
|
||||||
|
@ -1524,19 +1398,6 @@ bool compareTypes(Type * leftType, Type * rightType) {
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
Type * varType = NULL;
|
|
||||||
if(assign.variable->kind == VariableKindDeclaration) {
|
|
||||||
varType = assign.variable->impl.declaration.type;
|
|
||||||
}else if(assign.variable->kind == VariableKindDefinition) {
|
|
||||||
varType = assign.variable->impl.definiton.declaration.type;
|
|
||||||
}else {
|
|
||||||
PANIC("the vartype should be a declaration or a definition");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!compareTypes(varType,assign.value->result)) {
|
|
||||||
//TODO free everything
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
ParentStatement->impl.assignment = assign;
|
ParentStatement->impl.assignment = assign;
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
@ -2014,16 +1875,6 @@ int createBox(GHashTable *boxes, AST_NODE_PTR currentNode){
|
||||||
}
|
}
|
||||||
g_hash_table_insert(boxes, (gpointer)boxName, box);
|
g_hash_table_insert(boxes, (gpointer)boxName, box);
|
||||||
|
|
||||||
Type* boxType = malloc(sizeof(Type));
|
|
||||||
boxType->nodePtr = currentNode;
|
|
||||||
boxType->kind = TypeKindBox;
|
|
||||||
boxType->impl.box = box;
|
|
||||||
|
|
||||||
if(g_hash_table_contains(declaredBoxes, (gpointer)boxName)){
|
|
||||||
return SEMANTIC_ERROR;
|
|
||||||
}
|
|
||||||
g_hash_table_insert(declaredBoxes, (gpointer)boxName, boxType);
|
|
||||||
|
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
|
|
||||||
|
|
||||||
|
@ -2117,7 +1968,6 @@ Module *create_set(AST_NODE_PTR currentNode){
|
||||||
GArray *vars;
|
GArray *vars;
|
||||||
int status = createDecl(currentNode->children[i], &vars);
|
int status = createDecl(currentNode->children[i], &vars);
|
||||||
if (status) {
|
if (status) {
|
||||||
// TODO: free vars
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (fillTablesWithVars(variables, vars) == SEMANTIC_ERROR) {
|
if (fillTablesWithVars(variables, vars) == SEMANTIC_ERROR) {
|
||||||
|
@ -2125,12 +1975,11 @@ Module *create_set(AST_NODE_PTR currentNode){
|
||||||
// of variables even if just one of the declared variables
|
// of variables even if just one of the declared variables
|
||||||
// is duplicate. Consider moving this diagnostic to
|
// is duplicate. Consider moving this diagnostic to
|
||||||
// `fillTablesWithVars` for more precise messaging.
|
// `fillTablesWithVars` for more precise messaging.
|
||||||
print_diagnostic(current_file, ¤tNode->children[i]->location, Error, "Variable already declared");
|
print_diagnostic(current_file, ¤tNode->children[i]->location, Error,
|
||||||
|
"Variable already declared");
|
||||||
INFO("var already exists");
|
INFO("var already exists");
|
||||||
// TODO: free vars
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// TODO: free vars
|
|
||||||
DEBUG("filled successfull the module and scope with vars");
|
DEBUG("filled successfull the module and scope with vars");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -2138,8 +1987,6 @@ Module *create_set(AST_NODE_PTR currentNode){
|
||||||
GArray *vars;
|
GArray *vars;
|
||||||
int status = createDef(currentNode->children[i], &vars);
|
int status = createDef(currentNode->children[i], &vars);
|
||||||
if (status) {
|
if (status) {
|
||||||
// TODO: free vars
|
|
||||||
// TODO: cleanup global memory
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
// TODO: free vars
|
// TODO: free vars
|
||||||
|
@ -2149,7 +1996,6 @@ Module *create_set(AST_NODE_PTR currentNode){
|
||||||
case AST_Box: {
|
case AST_Box: {
|
||||||
int status = createBox(boxes, currentNode->children[i]);
|
int status = createBox(boxes, currentNode->children[i]);
|
||||||
if (status) {
|
if (status) {
|
||||||
// TODO: cleanup global memory
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
188
src/set/types.c
188
src/set/types.c
|
@ -1,188 +0,0 @@
|
||||||
//
|
|
||||||
// Created by servostar on 6/7/24.
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <mem/cache.h>
|
|
||||||
#include <set/types.h>
|
|
||||||
|
|
||||||
void delete_box(BoxType *box) {
|
|
||||||
g_hash_table_destroy(box->member);
|
|
||||||
mem_free(box);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_box_table(GHashTable *box_table) {
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
BoxType *box = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, box_table);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&box)) {
|
|
||||||
delete_box(box);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(box_table);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_imports(GArray *imports) { g_array_free(imports, TRUE); }
|
|
||||||
|
|
||||||
void delete_box_member(BoxMember *member) {
|
|
||||||
member->box = NULL;
|
|
||||||
delete_expression(member->initalizer);
|
|
||||||
delete_type(member->type);
|
|
||||||
mem_free((void *)member->name);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_box_type(BoxType *box_type) {
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
BoxMember *member = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, box_type->member);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&member)) {
|
|
||||||
delete_box_member(member);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(box_type->member);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_composite([[maybe_unused]] CompositeType *composite) {}
|
|
||||||
|
|
||||||
void delete_type(Type *type) {
|
|
||||||
switch (type->kind) {
|
|
||||||
case TypeKindBox:
|
|
||||||
delete_box_type(type->impl.box);
|
|
||||||
break;
|
|
||||||
case TypeKindReference:
|
|
||||||
delete_type(type->impl.reference);
|
|
||||||
break;
|
|
||||||
case TypeKindPrimitive:
|
|
||||||
break;
|
|
||||||
case TypeKindComposite:
|
|
||||||
delete_composite(&type->impl.composite);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_type_table(GHashTable *type_table) {
|
|
||||||
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
Type *type = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, type_table);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&type)) {
|
|
||||||
delete_type(type);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(type_table);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_box_access(BoxAccess *access) {
|
|
||||||
delete_variable(access->variable);
|
|
||||||
|
|
||||||
for (guint i = 0; i < access->member->len; i++) {
|
|
||||||
delete_box_member(g_array_index(access->member, BoxMember *, i));
|
|
||||||
}
|
|
||||||
|
|
||||||
g_array_free(access->member, TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_variable(Variable *variable) {
|
|
||||||
switch (variable->kind) {
|
|
||||||
case VariableKindBoxMember:
|
|
||||||
delete_box_access(&variable->impl.member);
|
|
||||||
break;
|
|
||||||
case VariableKindDeclaration:
|
|
||||||
delete_declaration(&variable->impl.declaration);
|
|
||||||
break;
|
|
||||||
case VariableKindDefinition:
|
|
||||||
delete_definition(&variable->impl.definiton);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_declaration(VariableDeclaration *decl) { delete_type(decl->type); }
|
|
||||||
|
|
||||||
void delete_definition(VariableDefiniton *definition) {
|
|
||||||
delete_declaration(&definition->declaration);
|
|
||||||
delete_expression(definition->initializer);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_type_value(TypeValue *value) {
|
|
||||||
delete_type(value->type);
|
|
||||||
mem_free(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_operation(Operation *operation) {
|
|
||||||
for (guint i = 0; i < operation->operands->len; i++) {
|
|
||||||
delete_expression(g_array_index(operation->operands, Expression *, i));
|
|
||||||
}
|
|
||||||
|
|
||||||
g_array_free(operation->operands, TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_transmute(Transmute *trans) {
|
|
||||||
delete_expression(trans->operand);
|
|
||||||
delete_type(trans->targetType);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_typecast(TypeCast *cast) {
|
|
||||||
delete_expression(cast->operand);
|
|
||||||
delete_type(cast->targetType);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_expression(Expression *expr) {
|
|
||||||
delete_type(expr->result);
|
|
||||||
|
|
||||||
switch (expr->kind) {
|
|
||||||
case ExpressionKindConstant:
|
|
||||||
delete_type_value(&expr->impl.constant);
|
|
||||||
break;
|
|
||||||
case ExpressionKindOperation:
|
|
||||||
delete_operation(&expr->impl.operation);
|
|
||||||
break;
|
|
||||||
case ExpressionKindTransmute:
|
|
||||||
delete_transmute(&expr->impl.transmute);
|
|
||||||
break;
|
|
||||||
case ExpressionKindTypeCast:
|
|
||||||
delete_typecast(&expr->impl.typecast);
|
|
||||||
break;
|
|
||||||
case ExpressionKindVariable:
|
|
||||||
delete_variable(expr->impl.variable);
|
|
||||||
default:
|
|
||||||
//TODO free Reference and AddressOf
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_variable_table(GHashTable *variable_table) {
|
|
||||||
|
|
||||||
GHashTableIter iter;
|
|
||||||
char *name = NULL;
|
|
||||||
Variable *variable = NULL;
|
|
||||||
|
|
||||||
g_hash_table_iter_init(&iter, variable_table);
|
|
||||||
|
|
||||||
while (g_hash_table_iter_next(&iter, (gpointer)&name, (gpointer)&variable)) {
|
|
||||||
delete_variable(variable);
|
|
||||||
mem_free(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hash_table_destroy(variable_table);
|
|
||||||
}
|
|
||||||
|
|
||||||
void delete_module(Module *module) {
|
|
||||||
|
|
||||||
delete_box_table(module->boxes);
|
|
||||||
delete_imports(module->imports);
|
|
||||||
delete_type_table(module->types);
|
|
||||||
delete_variable_table(module->variables);
|
|
||||||
|
|
||||||
mem_free(module);
|
|
||||||
}
|
|
Loading…
Reference in New Issue