krzosa/corelang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing generated names

Browse Source
This commit is contained in:
Krzosa Karol
2022-06-13 20:55:49 +02:00
parent 30f448a490
commit 3bbe5e5c2b
2 changed files with 86 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
ccodegen.cpp
View File

@@ -34,17 +34,18 @@ gen_scope_name(Ast_Scope *scope){
// 4 Add type name on the left side
function void
gen_simple_decl_prefix(Ast_Type *ast){
gen_simple_decl_prefix(Ast_Type *ast, bool scope_names){
switch(ast->kind){
case TYPE_POINTER: gen_simple_decl_prefix(ast->base); gen("*"); break;
case TYPE_ARRAY: gen_simple_decl_prefix(ast->base); break;
case TYPE_POINTER: gen_simple_decl_prefix(ast->base, scope_names); gen("*"); break;
case TYPE_ARRAY: gen_simple_decl_prefix(ast->base, scope_names); break;
case TYPE_LAMBDA:break;
case TYPE_ENUM:{
gen_simple_decl_prefix(ast->base); break;
gen_simple_decl_prefix(ast->base, scope_names); break;
}break;
case TYPE_STRUCT: {
auto constant = (Ast_Decl *)ast->ast;
auto name = constant->name;
if(scope_names) gen_scope_name(constant->parent_scope);
gen("%s ", name.str);
}break;
default: {
@@ -54,15 +55,15 @@ gen_simple_decl_prefix(Ast_Type *ast){
}
function void
gen_simple_decl_postfix(Ast_Type *ast){
gen_simple_decl_postfix(Ast_Type *ast, bool scope_names){
switch(ast->kind){
case TYPE_POINTER: gen_simple_decl_postfix(ast->base); break;
case TYPE_POINTER: gen_simple_decl_postfix(ast->base, scope_names); break;
case TYPE_ARRAY:
gen("[");
if(ast->arr.size != ARRAY_SIZE_INFERRED)
gen("%d", (int)ast->arr.size);
gen("]");
gen_simple_decl_postfix(ast->arr.base); break;
gen_simple_decl_postfix(ast->arr.base, scope_names); break;
case TYPE_LAMBDA:break;
case TYPE_ENUM: case TYPE_STRUCT:break;
default: name(ast);
@@ -70,23 +71,23 @@ gen_simple_decl_postfix(Ast_Type *ast){
}
function void
gen_simple_decl(Ast_Type *ast, Intern_String name = {}, Ast_Scope *scope = 0){
gen_simple_decl(Ast_Type *ast, Intern_String name = {}, Ast_Scope *scope = 0, bool scope_names = true){
if(ast->kind == TYPE_LAMBDA) {
gen_simple_decl_prefix(ast->func.ret);
gen_simple_decl_prefix(ast->func.ret, scope_names);
gen("(*%s)(", name.str);
For(ast->func.args){
gen_simple_decl_prefix(it);
gen_simple_decl_prefix(it, scope_names);
if(&it != ast->func.args.end() - 1) gen(", ");
}
gen(")");
}
else{
gen_simple_decl_prefix(ast);
gen_simple_decl_prefix(ast, scope_names);
if(name.len) {
if(scope) gen_scope_name(scope);
if(scope && scope_names) gen_scope_name(scope);
gen("%s", name.str);
}
gen_simple_decl_postfix(ast);
gen_simple_decl_postfix(ast, scope_names);
}
}
@@ -133,8 +134,8 @@ enum {
};
function void
gen_var(Ast_Decl *decl, B32 emit_value){
gen_simple_decl(decl->type, decl->name, decl->parent_scope);
gen_var(Ast_Decl *decl, B32 emit_value, B32 scope_names){
gen_simple_decl(decl->type, decl->name, decl->parent_scope, scope_names);
if(emit_value == DONT_EMIT_VALUE){
return;
@@ -154,15 +155,16 @@ gen_var(Ast_Decl *decl, B32 emit_value){
function void
gen_lambda(Intern_String name, Ast_Lambda *lambda){
gen_simple_decl(lambda->type->func.ret, name, lambda->parent_scope);
bool is_foreign = is_flag_set(lambda->flags, AST_FOREIGN);
gen_simple_decl(lambda->type->func.ret, name, lambda->parent_scope, !is_foreign);
gen("(");
For(lambda->args){
gen_var(it, DONT_EMIT_VALUE);
gen_var(it, DONT_EMIT_VALUE, true);
if(&it != (lambda->args.end() - 1)) gen(", ");
}
gen(")");
if(lambda->scope) {
if(lambda->scope){
gen_stmt_scope(lambda->scope);
}
else gen(";");
@@ -172,7 +174,12 @@ function void
gen_expr(Ast_Expr *ast){
switch(ast->kind){
CASE(IDENT, Atom){
gen_scope_name(node->resolved_decl->parent_scope);
B32 print_scope = true;
if(node->resolved_decl->lambda){
if(is_flag_set(node->resolved_decl->lambda->flags, AST_FOREIGN))
print_scope = false;
}
if(print_scope) gen_scope_name(node->resolved_decl->parent_scope);
gen("%s", node->intern_val.str);
BREAK();
}
@@ -286,7 +293,7 @@ gen_ast(Ast *ast){
}
CASE(VAR, Decl){
gen_var(node, is_inside_struct ? DONT_EMIT_VALUE : ALWAYS_EMIT_VALUE);
gen_var(node, is_inside_struct ? DONT_EMIT_VALUE : ALWAYS_EMIT_VALUE, true);
if(!is_flag_set(ast->flags, AST_EXPR)) gen(";");
BREAK();
}
@@ -557,24 +564,6 @@ global F64 generating_time_end;
function String
end_compilation(){
generating_time_begin = os_time();
For(pctx->ordered_decls){
genln("");
gen_ast(it);
}
exp_destroy(pctx->heap);
String string_result = string_flatten(pctx->perm, &pctx->gen);
generating_time_end = os_time();
return string_result;
}
#if 0
F64 parse_end = os_time();
For(pctx->packages){
resolve_package(it);
}
#if 0
gen(R"==(
@@ -598,6 +587,8 @@ typedef S64 SizeS;
typedef float F32;
typedef double F64;
typedef S32 Bool;
#define true 1
#define false 0
typedef struct Slice{
S64 len;
@@ -622,19 +613,8 @@ int main(){
gen_ast(it);
}
exp_destroy(&heap);
F64 flattening_begin = os_time();
String string_result = string_flatten(scratch, &pctx->gen);
F64 flattening_end = os_time();
printf("\n//-------------------------------");
printf("\n// Parse : %f", parse_end - parse_begin);
printf("\n// Flattening : %f", flattening_end - flattening_begin);
printf("\n// Total : %f", flattening_end - total_time);
printf("\n//-------------------------------");
exp_destroy(pctx->heap);
String string_result = string_flatten(pctx->perm, &pctx->gen);
generating_time_end = os_time();
return string_result;
}
#endif