From 08558d8cdab7598c4a2e077bd665b49bfee18a79 Mon Sep 17 00:00:00 2001
From: Zuhaitz Méndez Fernández de Aránguiz <zuhaitz@debian>
Date: Sat, 24 Jan 2026 12:29:20 +0000
Subject: Fix for #107

---
 src/codegen/codegen_utils.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/codegen/codegen_utils.c')

diff --git a/src/codegen/codegen_utils.c b/src/codegen/codegen_utils.c
index a7e4925..3169eba 100644
--- a/src/codegen/codegen_utils.c
+++ b/src/codegen/codegen_utils.c
@@ -519,8 +519,22 @@ char *extract_call_args(const char *args)
 // Parse original method name from mangled name.
 const char *parse_original_method_name(const char *mangled)
 {
-    const char *last = strrchr(mangled, '_');
-    return last ? last + 1 : mangled;
+    const char *sep = strstr(mangled, "__");
+    if (!sep)
+    {
+        return mangled;
+    }
+
+    // Let's iterate to find the last `__`.
+    const char *last_double = NULL;
+    const char *p = mangled;
+    while ((p = strstr(p, "__")))
+    {
+        last_double = p;
+        p += 2;
+    }
+
+    return last_double ? last_double + 2 : mangled;
 }
 
 // Replace string type in arguments.
-- 
cgit v1.2.3