Merge branch 'main' into pr-109

1 files changed, 21 insertions, 1 deletions

diff --git a/src/codegen/codegen_decl.c b/src/codegen/codegen_decl.c
index 18d81f5..d525963 100644
--- a/src/codegen/codegen_decl.c
+++ b/src/codegen/codegen_decl.c
@@ -953,7 +953,20 @@ void emit_impl_vtables(ParserContext *ctx, FILE *out)
             ASTNode *m = node->impl_trait.methods;
             while (m)
             {
-                const char *orig = parse_original_method_name(m->func.name);
+                // Calculate expected prefix: Struct__Trait_
+                char prefix[256];
+                sprintf(prefix, "%s__%s_", strct, trait);
+                const char *orig = m->func.name;
+                if (strncmp(orig, prefix, strlen(prefix)) == 0)
+                {
+                    orig += strlen(prefix);
+                }
+                else
+                {
+                    // Fallback if mangling schema differs (shouldn't happen)
+                    orig = parse_original_method_name(m->func.name);
+                }
+
                 fprintf(out, ".%s = (__typeof__(((%s_VTable*)0)->%s))%s__%s_%s", orig, trait, orig,
                         strct, trait, orig);
                 if (m->next)
@@ -978,7 +991,14 @@ int emit_tests_and_runner(ParserContext *ctx, ASTNode *node, FILE *out)
         if (cur->type == NODE_TEST)
         {
             fprintf(out, "static void _z_test_%d() {\n", test_count);
+            int saved = defer_count;
             codegen_walker(ctx, cur->test_stmt.body, out);
+            // Run defers
+            for (int i = defer_count - 1; i >= saved; i--)
+            {
+                codegen_node_single(ctx, defer_stack[i], out);
+            }
+            defer_count = saved;
             fprintf(out, "}\n");
             test_count++;
         }