wip

JPCM-e-V · Jan 13, 2024 · 84083b2 · 84083b2
1 parent 2b63eb8
commit 84083b2
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 79 deletions.
diff --git a/src/ptlang_ast/ptlang_ast.c b/src/ptlang_ast/ptlang_ast.c
@@ -1045,7 +1045,7 @@ ptlang_ast_exp ptlang_ast_exp_copy(ptlang_ast_exp exp)
     }
     case PTLANG_AST_EXP_FUNCTION_CALL:
     {
-        copy->content.function_call.function = ptlang_ast_exp_copy(copy->content.function_call.function);
+        copy->content.function_call.function = ptlang_ast_exp_copy(exp->content.function_call.function);
         copy->content.function_call.parameters = NULL;
         for (size_t i = 0; i < arrlenu(exp->content.function_call.parameters); i++)
         {
@@ -1087,7 +1087,7 @@ ptlang_ast_exp ptlang_ast_exp_copy(ptlang_ast_exp exp)
     }
     case PTLANG_AST_EXP_TERNARY:
         copy->content.ternary_operator.condition =
-            ptlang_ast_exp_copy(copy->content.ternary_operator.condition);
+            ptlang_ast_exp_copy(exp->content.ternary_operator.condition);
         copy->content.ternary_operator.if_value = ptlang_ast_exp_copy(exp->content.ternary_operator.if_value);
         copy->content.ternary_operator.else_value =
             ptlang_ast_exp_copy(exp->content.ternary_operator.else_value);
@@ -1115,6 +1115,7 @@ ptlang_ast_exp ptlang_ast_exp_copy(ptlang_ast_exp exp)
                                 ? exp->ast_type->content.integer.size
                                 : exp->ast_type->content.float_size;
         uint32_t byte_size = (bit_size - 1) / 8 + 1;
+        copy->content.binary = ptlang_malloc(byte_size);
         memcpy(copy->content.binary, exp->content.binary, byte_size);
     }
     }

diff --git a/src/ptlang_ast/ptlang_ast.h b/src/ptlang_ast/ptlang_ast.h
@@ -153,7 +153,7 @@ ptlang_ast_exp ptlang_ast_exp_array_element_new(ptlang_ast_exp array, ptlang_ast
 ptlang_ast_exp ptlang_ast_exp_reference_new(bool writable, ptlang_ast_exp value,
                                             ptlang_ast_code_position pos);
 ptlang_ast_exp ptlang_ast_exp_dereference_new(ptlang_ast_exp value, ptlang_ast_code_position pos);
-ptlang_ast_exp ptlang_ast_exp_binary_new(uint8_t* binary, ptlang_ast_exp prev);
+ptlang_ast_exp ptlang_ast_exp_binary_new(uint8_t *binary, ptlang_ast_exp prev);
 
 ptlang_ast_stmt ptlang_ast_stmt_block_new(ptlang_ast_code_position pos);
 void ptlang_ast_stmt_block_add_stmt(ptlang_ast_stmt block_stmt, ptlang_ast_stmt stmt);
@@ -199,5 +199,4 @@ ptlang_ast_exp ptlang_ast_exp_copy(ptlang_ast_exp exp);
 
 ptlang_ast_ident ptlang_ast_ident_copy(ptlang_ast_ident ident);
 
-
 #endif
diff --git a/src/ptlang_eval/ptlang_eval.c b/src/ptlang_eval/ptlang_eval.c
@@ -5,7 +5,7 @@ ptlang_ast_exp ptlang_eval_const_exp(ptlang_ast_exp exp)
     LLVMContextRef C = LLVMContextCreate();
     LLVMModuleRef M = LLVMModuleCreateWithNameInContext("ptlang_eval", C);
 
-    LLVMTypeRef type = ptlang_ir_builder_type(exp->ast_type, NULL, C);
+    // LLVMTypeRef type = ptlang_ir_builder_type(exp->ast_type, NULL, C);
 
     LLVMTypeRef func_type =
         LLVMFunctionType(LLVMVoidTypeInContext(C), (LLVMTypeRef[]){LLVMPointerTypeInContext(C, 0)}, 1, false);

diff --git a/src/ptlang_ir_builder/ptlang_ir_builder.c b/src/ptlang_ir_builder/ptlang_ir_builder.c
@@ -301,8 +301,8 @@ LLVMTypeRef ptlang_ir_builder_type(ptlang_ast_type type, ptlang_ir_builder_build
         {
             param_types[i] = ptlang_ir_builder_type(type->content.function.parameters[i], ctx, C);
         }
-        function_type = LLVMFunctionType(ptlang_ir_builder_type(type->content.function.return_type, ctx, C),
-                                         param_types, arrlenu(type->content.function.parameters), false);
+        // function_type = LLVMFunctionType(ptlang_ir_builder_type(type->content.function.return_type, ctx, C),
+        //                                  param_types, arrlenu(type->content.function.parameters), false);
         ptlang_free(param_types);
         function_type = LLVMPointerTypeInContext(C, 0);
         return function_type;
@@ -1695,6 +1695,8 @@ LLVMValueRef ptlang_ir_builder_exp(ptlang_ast_exp exp, ptlang_ir_builder_build_c
 
         LLVMValueRef as_array = LLVMConstArray(LLVMArrayType(byte, byte_size), bytes, byte_size);
 
+        ptlang_free(bytes);
+
         LLVMValueRef as_int = LLVMConstBitCast(as_array, LLVMIntType(byte_size * 8));
         if (bit_size != byte_size * 8)
         {

diff --git a/src/ptlang_ir_builder/ptlang_ir_builder.h b/src/ptlang_ir_builder/ptlang_ir_builder.h
@@ -10,7 +10,6 @@ typedef struct ptlang_ir_builder_scope_s ptlang_ir_builder_scope;
 
 typedef struct ptlang_ir_builder_struct_def_s ptlang_ir_builder_struct_def;
 
-
 typedef struct ptlang_ir_builder_build_context_s
 {
     LLVMBuilderRef builder;
@@ -34,5 +33,4 @@ typedef struct ptlang_ir_builder_build_context_s
 LLVMTypeRef ptlang_ir_builder_type(ptlang_ast_type type, ptlang_ir_builder_build_context *ctx,
                                    LLVMContextRef C);
 
- LLVMValueRef ptlang_ir_builder_exp(ptlang_ast_exp exp, ptlang_ir_builder_build_context *ctx);
-
+LLVMValueRef ptlang_ir_builder_exp(ptlang_ast_exp exp, ptlang_ir_builder_build_context *ctx);
diff --git a/src/ptlang_main/main.c b/src/ptlang_main/main.c
@@ -60,7 +60,7 @@ int main(void)
         exit(1);
     }
 
-    pltang_context_destory(&ctx);
+    ptlang_context_destory(&ctx);
 
     LLVMModuleRef llvmmod = ptlang_ir_builder_module(mod, target_data_layout);
     LLVMDumpModule(llvmmod);

diff --git a/src/ptlang_main/ptlang_context.c b/src/ptlang_main/ptlang_context.c
@@ -1,6 +1,6 @@
 #include "ptlang_context.h"
 
-void pltang_context_destory(ptlang_context *ctx) { shfree(ctx->type_scope); }
+void ptlang_context_destory(ptlang_context *ctx) { shfree(ctx->type_scope); }
 
 ptlang_ast_type ptlang_context_unname_type(ptlang_ast_type type, ptlang_context_type_scope *type_scope)
 {
@@ -82,6 +82,8 @@ size_t ptlang_context_type_to_string(ptlang_ast_type type, char *out, ptlang_con
         {
             memcpy(out, "Error Type", size);
         }
+
+        return size;
     }
     switch (type->type)
     {

diff --git a/src/ptlang_main/ptlang_context.h b/src/ptlang_main/ptlang_context.h
@@ -34,7 +34,7 @@ typedef struct ptlang_context_s
     LLVMTargetDataRef target_data_layout;
 } ptlang_context;
 
-void pltang_context_destory(ptlang_context *ctx);
+void ptlang_context_destory(ptlang_context *ctx);
 
 ptlang_ast_type ptlang_context_unname_type(ptlang_ast_type type, ptlang_context_type_scope *type_scope);
 

diff --git a/src/ptlang_utils/ptlang_utils.h b/src/ptlang_utils/ptlang_utils.h
@@ -25,6 +25,7 @@ struct node_s
     size_t index;
     size_t lowlink;
     bool on_stack;
+    void* data;
 };
 
 typedef struct ptlang_utils_str