first kind of working implementation of set
This commit is contained in:
parent
069369ca61
commit
4067339df8
|
@ -11,6 +11,7 @@
|
||||||
#include <io/files.h>
|
#include <io/files.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <cfg/opt.h>
|
#include <cfg/opt.h>
|
||||||
|
#include <set/set.h>
|
||||||
|
|
||||||
extern void yyrestart(FILE *);
|
extern void yyrestart(FILE *);
|
||||||
|
|
||||||
|
@ -140,7 +141,7 @@ static void build_target(ModuleFileStack *unit, const TargetConfig *target) {
|
||||||
if (setup_target_environment(target) == 0) {
|
if (setup_target_environment(target) == 0) {
|
||||||
|
|
||||||
print_ast_to_file(ast, target);
|
print_ast_to_file(ast, target);
|
||||||
|
Module * test = create_set(ast);
|
||||||
// TODO: parse AST to semantic values
|
// TODO: parse AST to semantic values
|
||||||
// TODO: backend codegen
|
// TODO: backend codegen
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ int scale_factor_from(const char* string, double* factor) {
|
||||||
int check_scale_factor(AST_NODE_PTR node, Scale scale) {
|
int check_scale_factor(AST_NODE_PTR node, Scale scale) {
|
||||||
assert(node != NULL);
|
assert(node != NULL);
|
||||||
|
|
||||||
if (8 > scale) {
|
if (8 < 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;
|
||||||
}
|
}
|
||||||
|
@ -222,6 +222,7 @@ int get_type_impl(AST_NODE_PTR currentNode, Type** type) {
|
||||||
assert(currentNode != NULL);
|
assert(currentNode != NULL);
|
||||||
assert(currentNode->kind == AST_Type);
|
assert(currentNode->kind == AST_Type);
|
||||||
assert(currentNode->child_count > 0);
|
assert(currentNode->child_count > 0);
|
||||||
|
DEBUG("start Type");
|
||||||
|
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
|
@ -340,7 +341,8 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
|
|
||||||
AST_NODE_PTR declaration = currentNode->children[0];
|
AST_NODE_PTR declaration = currentNode->children[0];
|
||||||
AST_NODE_PTR expression = currentNode->children[1];
|
AST_NODE_PTR expression = currentNode->children[1];
|
||||||
AST_NODE_PTR ident_list = currentNode->children[0]->children[currentNode->child_count - 1];
|
AST_NODE_PTR ident_list = declaration->children[currentNode->child_count - 1];
|
||||||
|
|
||||||
|
|
||||||
*variables = g_array_new(FALSE, FALSE, sizeof(Variable*));
|
*variables = g_array_new(FALSE, FALSE, sizeof(Variable*));
|
||||||
|
|
||||||
|
@ -351,20 +353,20 @@ int createDef(AST_NODE_PTR currentNode, GArray** variables) {
|
||||||
int status = SEMANTIC_OK;
|
int status = SEMANTIC_OK;
|
||||||
|
|
||||||
DEBUG("Child Count: %i", declaration->child_count);
|
DEBUG("Child Count: %i", declaration->child_count);
|
||||||
for (size_t i = 0; i < declaration->children[i]->child_count; i++){
|
for (size_t i = 0; i < declaration->child_count; i++){
|
||||||
switch(declaration->children[i]->kind) {
|
switch(declaration->children[i]->kind) {
|
||||||
case AST_Storage:
|
case AST_Storage:
|
||||||
DEBUG("fill Qualifier");
|
DEBUG("fill Qualifier");
|
||||||
decl.qualifier = Qualifier_from_string(currentNode->children[i]->value);
|
decl.qualifier = Qualifier_from_string(declaration->children[i]->value);
|
||||||
break;
|
break;
|
||||||
case AST_Type:
|
case AST_Type:
|
||||||
DEBUG("fill Type");
|
DEBUG("fill Type");
|
||||||
status = get_type_impl(currentNode->children[i], &decl.type);
|
status = get_type_impl(declaration->children[i], &decl.type);
|
||||||
break;
|
break;
|
||||||
case AST_IdentList:
|
case AST_IdentList:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
PANIC("invalid node type: %ld", currentNode->children[i]->kind);
|
PANIC("invalid node type: %ld", declaration->children[i]->kind);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1087,6 +1089,7 @@ int createTransmute(Expression* ParentExpression, AST_NODE_PTR currentNode){
|
||||||
|
|
||||||
|
|
||||||
Expression *createExpression(AST_NODE_PTR currentNode){
|
Expression *createExpression(AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("create Expression");
|
||||||
Expression *expression = malloc(sizeof(Expression));
|
Expression *expression = malloc(sizeof(Expression));
|
||||||
expression->nodePtr = currentNode;
|
expression->nodePtr = currentNode;
|
||||||
switch(currentNode->kind){
|
switch(currentNode->kind){
|
||||||
|
@ -1222,6 +1225,7 @@ Expression *createExpression(AST_NODE_PTR currentNode){
|
||||||
int createStatement(Block * block, AST_NODE_PTR currentNode);
|
int createStatement(Block * block, AST_NODE_PTR currentNode);
|
||||||
|
|
||||||
int fillBlock(Block * block,AST_NODE_PTR currentNode){
|
int fillBlock(Block * block,AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("start filling Block");
|
||||||
block->nodePtr = currentNode;
|
block->nodePtr = currentNode;
|
||||||
|
|
||||||
GHashTable * lowerScope = g_hash_table_new(g_str_hash,g_str_equal);
|
GHashTable * lowerScope = g_hash_table_new(g_str_hash,g_str_equal);
|
||||||
|
@ -1238,6 +1242,7 @@ int fillBlock(Block * block,AST_NODE_PTR currentNode){
|
||||||
g_hash_table_destroy(lowerScope);
|
g_hash_table_destroy(lowerScope);
|
||||||
g_array_remove_index(Scope, Scope->len-1);
|
g_array_remove_index(Scope, Scope->len-1);
|
||||||
|
|
||||||
|
DEBUG("created Block successfully");
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1349,7 +1354,7 @@ int createBranch(Statement* ParentStatement,AST_NODE_PTR currentNode){
|
||||||
}
|
}
|
||||||
|
|
||||||
int createStatement(Block * Parentblock , AST_NODE_PTR currentNode){
|
int createStatement(Block * Parentblock , AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("create Statement");
|
||||||
|
|
||||||
switch(currentNode->kind){
|
switch(currentNode->kind){
|
||||||
case AST_Decl:{
|
case AST_Decl:{
|
||||||
|
@ -1433,12 +1438,18 @@ int createStatement(Block * Parentblock , AST_NODE_PTR currentNode){
|
||||||
|
|
||||||
|
|
||||||
int createParam(GArray * Paramlist ,AST_NODE_PTR currentNode){
|
int createParam(GArray * Paramlist ,AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("start param");
|
||||||
|
DEBUG("current node child count: %i",currentNode->kind);
|
||||||
|
if( currentNode->kind == AST_Parameter){
|
||||||
|
DEBUG("current n");
|
||||||
|
}
|
||||||
AST_NODE_PTR paramdecl = currentNode->children[1];
|
AST_NODE_PTR paramdecl = currentNode->children[1];
|
||||||
AST_NODE_PTR ioQualifierList = currentNode->children[0];
|
AST_NODE_PTR ioQualifierList = currentNode->children[0];
|
||||||
|
|
||||||
ParameterDeclaration decl;
|
ParameterDeclaration decl;
|
||||||
decl.nodePtr = paramdecl;
|
decl.nodePtr = paramdecl;
|
||||||
|
|
||||||
|
DEBUG("paramnode child count: %i", ioQualifierList->child_count );
|
||||||
if(ioQualifierList->child_count == 2){
|
if(ioQualifierList->child_count == 2){
|
||||||
decl.qualifier = InOut;
|
decl.qualifier = InOut;
|
||||||
}else if(ioQualifierList->child_count == 1){
|
}else if(ioQualifierList->child_count == 1){
|
||||||
|
@ -1466,12 +1477,13 @@ int createParam(GArray * Paramlist ,AST_NODE_PTR currentNode){
|
||||||
param.name = paramdecl->children[1]->value;
|
param.name = paramdecl->children[1]->value;
|
||||||
|
|
||||||
g_array_append_val(Paramlist,param);
|
g_array_append_val(Paramlist,param);
|
||||||
|
DEBUG("created param successfully");
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int createFunDef(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
int createFunDef(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("start fundef");
|
||||||
AST_NODE_PTR nameNode = currentNode->children[0];
|
AST_NODE_PTR nameNode = currentNode->children[0];
|
||||||
AST_NODE_PTR paramlistlist = currentNode->children[1];
|
AST_NODE_PTR paramlistlist = currentNode->children[1];
|
||||||
AST_NODE_PTR statementlist = currentNode->children[2];
|
AST_NODE_PTR statementlist = currentNode->children[2];
|
||||||
|
@ -1508,13 +1520,14 @@ int createFunDef(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
||||||
Parentfunction->nodePtr = currentNode;
|
Parentfunction->nodePtr = currentNode;
|
||||||
Parentfunction->kind = FunctionDefinitionKind;
|
Parentfunction->kind = FunctionDefinitionKind;
|
||||||
Parentfunction->impl.definition = fundef;
|
Parentfunction->impl.definition = fundef;
|
||||||
|
Parentfunction->name = fundef.name;
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int createFunDecl(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
int createFunDecl(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("start fundecl");
|
||||||
AST_NODE_PTR nameNode = currentNode->children[0];
|
AST_NODE_PTR nameNode = currentNode->children[0];
|
||||||
AST_NODE_PTR paramlistlist = currentNode->children[1];
|
AST_NODE_PTR paramlistlist = currentNode->children[1];
|
||||||
|
|
||||||
|
@ -1545,29 +1558,34 @@ int createFunDecl(Function * Parentfunction ,AST_NODE_PTR currentNode){
|
||||||
Parentfunction->nodePtr = currentNode;
|
Parentfunction->nodePtr = currentNode;
|
||||||
Parentfunction->kind = FunctionDefinitionKind;
|
Parentfunction->kind = FunctionDefinitionKind;
|
||||||
Parentfunction->impl.declaration = fundecl;
|
Parentfunction->impl.declaration = fundecl;
|
||||||
|
Parentfunction->name = fundecl.name;
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
//TODO check if a function is present and if a declaration is present and identical.
|
//TODO check if a function is present and if a declaration is present and identical.
|
||||||
|
|
||||||
Function * createFunction( AST_NODE_PTR currentNode){
|
int createFunction(GHashTable* functions, AST_NODE_PTR currentNode){
|
||||||
|
assert(currentNode->kind == AST_Fun);
|
||||||
Function * fun = malloc(sizeof(Function));
|
Function * fun = malloc(sizeof(Function));
|
||||||
|
|
||||||
|
|
||||||
if(currentNode->child_count == 2){
|
if(currentNode->child_count == 2){
|
||||||
int signal = createFunDecl(fun, currentNode);
|
int signal = createFunDecl(fun, currentNode);
|
||||||
if (signal){
|
if (signal){
|
||||||
return NULL;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
}else if(currentNode->child_count == 3){
|
}else if(currentNode->child_count == 3){
|
||||||
int signal = createFunDef(fun, currentNode);
|
int signal = createFunDef(fun, currentNode);
|
||||||
if (signal){
|
if (signal){
|
||||||
return NULL;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
PANIC("function should have 2 or 3 children");
|
PANIC("function should have 2 or 3 children");
|
||||||
}
|
}
|
||||||
|
if(g_hash_table_contains(functions,fun->name)){
|
||||||
return fun;
|
return SEMANTIC_ERROR;
|
||||||
|
}
|
||||||
|
g_hash_table_insert(functions,(gpointer)fun->name, fun);
|
||||||
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1682,6 +1700,7 @@ int createBox(GHashTable *boxes, AST_NODE_PTR currentNode){
|
||||||
}
|
}
|
||||||
|
|
||||||
int createTypeDef(GHashTable *types, AST_NODE_PTR currentNode){
|
int createTypeDef(GHashTable *types, AST_NODE_PTR currentNode){
|
||||||
|
DEBUG("create Type define");
|
||||||
AST_NODE_PTR typeNode = currentNode->children[0];
|
AST_NODE_PTR typeNode = currentNode->children[0];
|
||||||
AST_NODE_PTR nameNode = currentNode->children[1];
|
AST_NODE_PTR nameNode = currentNode->children[1];
|
||||||
|
|
||||||
|
@ -1701,6 +1720,11 @@ int createTypeDef(GHashTable *types, AST_NODE_PTR currentNode){
|
||||||
return SEMANTIC_ERROR;
|
return SEMANTIC_ERROR;
|
||||||
}
|
}
|
||||||
g_hash_table_insert(types, (gpointer)def->name, def);
|
g_hash_table_insert(types, (gpointer)def->name, def);
|
||||||
|
if(g_hash_table_contains(declaredComposites, (gpointer)def->name)){
|
||||||
|
return SEMANTIC_ERROR;
|
||||||
|
}
|
||||||
|
g_hash_table_insert(declaredComposites, (gpointer)def->name, def);
|
||||||
|
|
||||||
return SEMANTIC_OK;
|
return SEMANTIC_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1771,7 +1795,16 @@ Module *create_set(AST_NODE_PTR currentNode){
|
||||||
DEBUG("created Box successfully");
|
DEBUG("created Box successfully");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case AST_Fun:
|
case AST_Fun:{
|
||||||
|
DEBUG("start function");
|
||||||
|
int status = createFunction(functions,currentNode->children[i]);
|
||||||
|
if (status){
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
DEBUG("created function successfully");
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
case AST_Typedef:{
|
case AST_Typedef:{
|
||||||
int status = createTypeDef(types, currentNode->children[i]);
|
int status = createTypeDef(types, currentNode->children[i]);
|
||||||
if (status){
|
if (status){
|
||||||
|
|
|
@ -233,6 +233,7 @@ typedef struct Function_t {
|
||||||
FunctionDeclaration declaration;
|
FunctionDeclaration declaration;
|
||||||
} impl;
|
} impl;
|
||||||
AST_NODE_PTR nodePtr;
|
AST_NODE_PTR nodePtr;
|
||||||
|
const char * name;
|
||||||
} Function;
|
} Function;
|
||||||
|
|
||||||
// .------------------------------------------------.
|
// .------------------------------------------------.
|
||||||
|
|
Loading…
Reference in New Issue