fix(RDRenderer): function declarations

Author: Dax89

src/core/function.c

@@ -245,46 +245,6 @@ void rd_i_function_rebuild_graph(RDFunction* self,
     if(oldgraph) rd_graph_destroy(oldgraph);
 }
 
-const char* rd_i_function_to_str(const RDFunction* self, RDContext* ctx) {
-    RDCharVect* t_buf = &ctx->type_buf;
-    str_clear(&ctx->tdef_buf);
-
-    const RDFunctionType* f_type = &self->type_def->func_;
-
-    if(f_type->ret.has_value) {
-        str_append(&ctx->tdef_buf, rd_i_type_to_str(&f_type->ret.value, t_buf));
-        str_push(&ctx->tdef_buf, ' ');
-    }
-
-    if(rd_function_is_noret(self)) str_append(&ctx->tdef_buf, "noreturn ");
-
-    RDName n; // try to get the name
-    if(rd_i_get_name(ctx, self->address, false, &n))
-        str_append(&ctx->tdef_buf, n.value);
-    else
-        str_append(&ctx->tdef_buf, self->type_def->name);
-
-    if(f_type->args.has_value) {
-
-        str_push(&ctx->tdef_buf, '(');
-        const RDParam* arg;
-        vect_each(arg, &f_type->args.value) {
-            assert(arg->name);
-            if(arg != vect_first(&f_type->args.value))
-                str_push(&ctx->tdef_buf, ',');
-
-            str_append(&ctx->tdef_buf, rd_i_type_to_str(&arg->type, t_buf));
-            str_push(&ctx->tdef_buf, ' ');
-            str_append(&ctx->tdef_buf, arg->name);
-        }
-
-        str_push(&ctx->tdef_buf, ')');
-    }
-
-    assert(!vect_is_empty(&ctx->tdef_buf));
-    return ctx->tdef_buf.data;
-}
-
 void rd_i_functionchunk_sort(RDFunctionChunkVect* self) {
     vect_sort(self, _rd_functionchunk_cmp_pred);
 }

src/core/function.h

@@ -43,7 +43,6 @@ void rd_i_function_set_type_def(RDFunction* self, const RDTypeDef* tdef);
 void rd_i_function_rebuild(RDFunction* self);
 void rd_i_function_rebuild_graph(RDFunction* self, RDFunctionChunkVect* chunks);
 usize rd_i_function_get_terminal_count(const RDFunction* self);
-const char* rd_i_function_to_str(const RDFunction* self, RDContext* ctx);
 RDFunctionChunk* rd_i_function_get_chunk(const RDFunction* self, RDGraphNode n);
 
 void rd_i_functionchunk_sort(RDFunctionChunkVect* self);

src/surface/items.c

@@ -285,24 +285,55 @@ static void _rd_render_function_item(RDRenderer* r, const RDSegmentFull* seg,
     }
 
     _rd_render_modifiers(r, seg, idx, RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
-    const char* func_str = f ? rd_i_function_to_str(f, r->context) : NULL;
 
-    if(func_str) {
-        rd_renderer_text(r, func_str, RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
-        return;
+    if(f) {
+        const RDFunctionType* f_type = &f->type_def->func_;
+
+        if(f_type->ret.has_value) {
+            rd_renderer_text(r,
+                             rd_i_type_to_str(&f_type->ret.value, &r->type_buf),
+                             RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
+            rd_renderer_ws(r, 1);
+        }
+
+        if(rd_function_is_noret(f)) {
+            rd_renderer_text(r, "noreturn ", RD_THEME_FUNCTION,
+                             RD_THEME_BACKGROUND);
+        }
+    }
+
+    if(!f || (f->type_def->flags & RD_TFLAGS_BUILTIN)) {
+        rd_renderer_text(r, "function ", RD_THEME_FUNCTION,
+                         RD_THEME_BACKGROUND);
     }
 
     RDName n;
     bool hasname = rd_i_get_name(r->context, address, true, &n);
     assert(hasname);
-
-    rd_renderer_text(r, "function ", RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
     rd_renderer_text(r, n.value, RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
-    rd_renderer_text(r, "()", RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
 
-    if(f && rd_function_is_noret(f)) {
-        rd_renderer_text(r, " noreturn", RD_THEME_FUNCTION,
-                         RD_THEME_BACKGROUND);
+    if(f) {
+        const RDFunctionType* f_type = &f->type_def->func_;
+
+        if(f_type->args.has_value) {
+            rd_renderer_text(r, "(", RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
+
+            const RDParam* arg;
+            vect_each(arg, &f_type->args.value) {
+                assert(arg->name);
+                if(arg != vect_first(&f_type->args.value))
+                    rd_renderer_text(r, ",", RD_THEME_FUNCTION,
+                                     RD_THEME_BACKGROUND);
+
+                rd_renderer_text(r, rd_i_type_to_str(&arg->type, &r->type_buf),
+                                 RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
+                rd_renderer_ws(r, 1);
+                rd_renderer_text(r, arg->name, RD_THEME_FUNCTION,
+                                 RD_THEME_BACKGROUND);
+            }
+
+            rd_renderer_text(r, ")", RD_THEME_FUNCTION, RD_THEME_BACKGROUND);
+        }
     }
 }
 

src/surface/renderer.c

@@ -82,6 +82,7 @@ RDRenderer* rd_i_renderer_create(RDContext* ctx, RDRenderFlags flags) {
 void rd_i_renderer_destroy(RDRenderer* self) {
     vect_destroy(&self->xrefs);
     vect_destroy(&self->comment_buf);
+    vect_destroy(&self->type_buf);
     vect_destroy(&self->text_buf);
     vect_destroy(&self->word_buf);
     rd_i_rowvect_destroy(&self->rows_back);

src/surface/renderer.h

@@ -20,6 +20,7 @@ typedef struct RDRenderer {
     RDCharVect comment_buf;
     RDCharVect word_buf;
     RDCharVect text_buf;
+    RDCharVect type_buf;
     RDXRefVect xrefs;
     RDInstructionVect instr_buf;
     char* hl_word;