Fixing generated names
This commit is contained in:
84
ccodegen.cpp
84
ccodegen.cpp
@@ -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
|
||||
123
program.c
123
program.c
@@ -1,6 +1,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
typedef int8_t S8;
|
||||
typedef int16_t S16;
|
||||
typedef int32_t S32;
|
||||
@@ -18,6 +19,8 @@ typedef S64 SizeS;
|
||||
typedef float F32;
|
||||
typedef double F64;
|
||||
typedef S32 Bool;
|
||||
#define true 1
|
||||
#define false 0
|
||||
|
||||
typedef struct Slice{
|
||||
S64 len;
|
||||
@@ -34,79 +37,61 @@ void entry();
|
||||
int main(){
|
||||
entry();
|
||||
}
|
||||
|
||||
#line 0 "program.kl"
|
||||
#line 1
|
||||
|
||||
#line 3
|
||||
typedef struct Token{
|
||||
U8 kind;
|
||||
U8 *str;
|
||||
S64 len;
|
||||
/*enum Kind{
|
||||
Number = 0,
|
||||
};*/
|
||||
}Token;
|
||||
#line 12
|
||||
String kind_name(U8 kind){
|
||||
#line 15
|
||||
if((kind==0)){
|
||||
#line 14
|
||||
return LIT("<Number>");
|
||||
}
|
||||
else{
|
||||
#line 16
|
||||
return LIT("<Unknown>");
|
||||
|
||||
// Type SizeU = base_
|
||||
// constant int OS_PAGE_SIZE = 4096
|
||||
typedef struct base_OS_Memory{
|
||||
U64 base_commit;
|
||||
U64 base_reserve;
|
||||
U8 *base_data;
|
||||
}base_OS_Memory;
|
||||
typedef struct base_Arena{
|
||||
base_OS_Memory base_memory;
|
||||
U64 base_alignment;
|
||||
U64 base_len;
|
||||
}base_Arena;
|
||||
U64 base_get_align_offset(U64 base_size, U64 base_align){
|
||||
U64 base_mask = (base_align-1);
|
||||
U64 base_val = (base_size&base_mask);
|
||||
if((base_val!=0)){
|
||||
base_val=(base_align-base_val);
|
||||
}
|
||||
return base_val;
|
||||
}
|
||||
#line 18
|
||||
Bool is_numeric(U8 c){
|
||||
#line 19
|
||||
Bool result = ((c>=48)&&(c<=57));
|
||||
#line 20
|
||||
return result;
|
||||
U64 base_align_up(U64 base_size, U64 base_align){
|
||||
U64 base_result = (base_size+base_get_align_offset(base_size, base_align));
|
||||
return base_result;
|
||||
}
|
||||
#line 22
|
||||
void print_tokens(Slice tokens){
|
||||
#line 23
|
||||
for(S64 i = 0;(i<tokens.len);(i++)){
|
||||
#line 24
|
||||
Token *t = (&(((Token *)tokens.data)[i]));
|
||||
#line 25
|
||||
printf("%d. %.*s", i, ((S32 )t->len), t->str);
|
||||
}
|
||||
// Type LPVOID = (*Windows_▬)
|
||||
// Type SIZE_T = Windows_
|
||||
// Type DWORD = Windows_♫
|
||||
/*foreign*/void *VirtualAlloc(void *Windows_lpAddress, U64 Windows_dwSize, U32 Windows_flAllocationType, U32 Windows_flProtect);
|
||||
// constant int MEM_RESERVE = 2
|
||||
// constant int PAGE_READWRITE = 4
|
||||
base_OS_Memory base_reserve(U64 base_size){
|
||||
base_OS_Memory base_result = (base_OS_Memory ){base_align_up(base_size, 4096)};
|
||||
base_result.base_data=((U8 *)VirtualAlloc(0, base_result.base_reserve, 2, 4));
|
||||
return base_result;
|
||||
}
|
||||
#line 27
|
||||
void entry(){
|
||||
#line 28
|
||||
String string_to_lex = LIT("Identifier 2425525 Not_Number");
|
||||
#line 29
|
||||
Slice token_array = (Slice){32, (Token [32]){}};
|
||||
#line 30
|
||||
S64 token_count = 0;
|
||||
#line 32
|
||||
Token t = {};
|
||||
#line 33
|
||||
for(S64 i = 0;(i<string_to_lex.len);i+=1){
|
||||
#line 34
|
||||
if(is_numeric((string_to_lex.str[i]))){
|
||||
#line 35
|
||||
t.kind=0;
|
||||
#line 36
|
||||
t.str=(&(string_to_lex.str[i]));
|
||||
#line 37
|
||||
t.len=i;
|
||||
#line 38
|
||||
for(;is_numeric((string_to_lex.str[i]));){
|
||||
#line 39
|
||||
i+=1;
|
||||
}
|
||||
#line 40
|
||||
t.len=(i-t.len);
|
||||
#line 41
|
||||
(((Token *)token_array.data)[(token_count++)])=t;
|
||||
}
|
||||
U64 base_clamp_top_sizeu(U64 base_val, U64 base_max){
|
||||
if((base_val>base_max)){
|
||||
return base_max;
|
||||
}
|
||||
#line 42
|
||||
print_tokens(token_array);
|
||||
return base_val;
|
||||
}
|
||||
// Type BOOL = Windows_♂
|
||||
/*foreign*/int VirtualFree(void *Windows_lpAddress, U64 Windows_dwSize, U32 Windows_dwFreeType);
|
||||
// constant int MEM_RELEASE = 6
|
||||
Bool base_commit(base_OS_Memory *base_m, U64 base_size){
|
||||
U64 base_commit_size = base_align_up(base_size, 4096);
|
||||
U64 base_total_commit = (base_m->base_commit+base_commit_size);
|
||||
U64 base_clamped_commit = base_clamp_top_sizeu(base_total_commit, base_m->base_reserve);
|
||||
U64 base_adjusted_commit = (base_clamped_commit-base_m->base_commit);
|
||||
if((base_adjusted_commit!=0)){
|
||||
int base_result = VirtualFree(((void *)base_m->base_data), 0, 6);
|
||||
base_m->base_commit+=base_adjusted_commit;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
Reference in New Issue
Block a user