Fix for #59

2 files changed, 36 insertions, 4 deletions

diff --git a/src/codegen/codegen.c b/src/codegen/codegen.c
index 9e85464..370bcec 100644
--- a/src/codegen/codegen.c
+++ b/src/codegen/codegen.c
@@ -1066,7 +1066,28 @@ void codegen_expression(ParserContext *ctx, ASTNode *node, FILE *out)
         {
             struct_name = g_current_impl_type;
         }
-        fprintf(out, "(struct %s){", struct_name);
+
+        int is_zen_struct = 0;
+        StructRef *sr = ctx->parsed_structs_list;
+        while (sr)
+        {
+            if (sr->node && sr->node->type == NODE_STRUCT &&
+                strcmp(sr->node->strct.name, struct_name) == 0)
+            {
+                is_zen_struct = 1;
+                break;
+            }
+            sr = sr->next;
+        }
+
+        if (is_zen_struct)
+        {
+            fprintf(out, "(struct %s){", struct_name);
+        }
+        else
+        {
+            fprintf(out, "(%s){", struct_name);
+        }
         ASTNode *f = node->struct_init.fields;
         while (f)
         {
diff --git a/src/parser/parser_type.c b/src/parser/parser_type.c
index b966a4d..1b5e8b6 100644
--- a/src/parser/parser_type.c
+++ b/src/parser/parser_type.c
@@ -141,9 +141,20 @@ Type *parse_type_base(ParserContext *ctx, Lexer *l)
             char *merged;
             if (mod)
             {
-                // Module-qualified type: Use module base name
-                merged = xmalloc(strlen(mod->base_name) + strlen(resolved_suffix) + 2);
-                sprintf(merged, "%s_%s", mod->base_name, resolved_suffix);
+                // Module-qualified type
+                if (mod->is_c_header)
+                {
+                    // C header: Use type name directly without prefix
+                    // To prevent name mangling, we might consider changing
+                    // this to also use the prefix.
+                    merged = xstrdup(resolved_suffix);
+                }
+                else
+                {
+                    // Zen module: Use module base name as prefix
+                    merged = xmalloc(strlen(mod->base_name) + strlen(resolved_suffix) + 2);
+                    sprintf(merged, "%s_%s", mod->base_name, resolved_suffix);
+                }
             }
             else
             {