[cpp] Mark overridden scriptable methods

src/generators/cpp/gen/cppGenClassImplementation.ml

@@ -977,20 +977,20 @@ let generate_managed_class base_ctx tcpp_class =
     if List.length tcpp_class.tcl_functions > 0 || List.length tcpp_class.tcl_static_functions > 0 then (
 
       let dump_script is_static f acc =
-        if not f.tcf_is_overriding && f.tcf_name <> "toString" then (* toString implicitly overrides hx::Object::toString *)
-          let signature = generate_script_function is_static f.tcf_field ("__s_" ^ f.tcf_field.cf_name) f.tcf_name in
-          let superCall = if is_static then "0" else "__s_" ^ f.tcf_field.cf_name ^ "<true>" in
-          let named =
-            Printf.sprintf
-              "\t::hx::ScriptNamedFunction(\"%s\", __s_%s, \"%s\", %s HXCPP_CPPIA_SUPER_ARG(%s))"
-              f.tcf_field.cf_name
-              f.tcf_field.cf_name
-              signature
-              (if is_static then "true" else "false")
-              superCall in
-
-          named :: acc
-        else acc
+        let signature = generate_script_function is_static f.tcf_field ("__s_" ^ f.tcf_field.cf_name) f.tcf_name in
+        let superCall = if is_static then "0" else "__s_" ^ f.tcf_field.cf_name ^ "<true>" in
+        let named =
+          Printf.sprintf
+            "\t::hx::ScriptNamedFunction(\"%s\", __s_%s, \"%s\", %s, %s HXCPP_CPPIA_SUPER_ARG(%s))"
+            f.tcf_field.cf_name
+            f.tcf_field.cf_name
+            signature
+            (if is_static then "true" else "false")
+            (* toString implicitly overrides hx::Object::toString *)
+            (if f.tcf_is_overriding || f.tcf_name = "toString" then "true" else "false")
+            superCall in
+
+        named :: acc
       in
 
       let sigs =

tests/unit/src/scripthost/Issue12413.hx

@@ -0,0 +1,17 @@
+package scripthost;
+
+#if cpp
+@:keep class HostParent12413 {
+	public function new() {}
+
+	public function methodA() {
+		return "HostParent";
+	}
+}
+
+@:keep class HostChild12413 extends HostParent12413 {
+	override function methodA() {
+		return super.methodA() + ", HostChild";
+	}
+}
+#end

tests/unit/src/unit/issues/Issue12413.hx

@@ -0,0 +1,20 @@
+package unit.issues;
+
+import scripthost.Issue12413;
+
+class Issue12413 extends Test {
+	#if cppia
+	public function test() {
+		var child:ScriptChild = new ScriptChild();
+		eq('HostParent, HostChild, ScriptChild', child.methodA());
+	}
+	#end
+}
+
+#if cppia
+private class ScriptChild extends HostChild12413 {
+	override function methodA() {
+		return super.methodA() + ", ScriptChild";
+	}
+}
+#end