From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 14 Jun 2020 06:59:51 +0000 (+0200)
Subject: Consistently use get_ccode_lower_case_prefix() for function names
X-Git-Tag: 0.46.11~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb463dd20a6908c92cb9859065db5544935792e0;p=thirdparty%2Fvala.git

Consistently use get_ccode_lower_case_prefix() for function names

Create the expected name for "constructor" and "finalize" functions
which are non-public API.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1008
---

diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
index 45a3da911..ff3ce66f9 100644
--- a/codegen/valagobjectmodule.vala
+++ b/codegen/valagobjectmodule.vala
@@ -63,14 +63,14 @@ public class Vala.GObjectModule : GTypeModule {
 		if (cl.constructor != null) {
 			var ccast = new CCodeFunctionCall (new CCodeIdentifier ("G_OBJECT_CLASS"));
 			ccast.add_argument (new CCodeIdentifier ("klass"));
-			ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, "constructor"), new CCodeIdentifier ("%s_constructor".printf (get_ccode_lower_case_name (cl, null))));
+			ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, "constructor"), new CCodeIdentifier ("%sconstructor".printf (get_ccode_lower_case_prefix (cl))));
 		}
 
 		/* set finalize function */
 		if (cl.get_fields ().size > 0 || cl.destructor != null) {
 			var ccast = new CCodeFunctionCall (new CCodeIdentifier ("G_OBJECT_CLASS"));
 			ccast.add_argument (new CCodeIdentifier ("klass"));
-			ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, "finalize"), new CCodeIdentifier ("%s_finalize".printf (get_ccode_lower_case_name (cl, null))));
+			ccode.add_assignment (new CCodeMemberAccess.pointer (ccast, "finalize"), new CCodeIdentifier ("%sfinalize".printf (get_ccode_lower_case_prefix (cl))));
 		}
 
 		/* create type, dup_func, and destroy_func properties for generic types */
@@ -482,7 +482,7 @@ public class Vala.GObjectModule : GTypeModule {
 
 			push_context (new EmitContext (c));
 
-			var function = new CCodeFunction ("%s_constructor".printf (get_ccode_lower_case_name (cl, null)), "GObject *");
+			var function = new CCodeFunction ("%sconstructor".printf (get_ccode_lower_case_prefix (cl)), "GObject *");
 			function.modifiers = CCodeModifiers.STATIC;
 
 			function.add_parameter (new CCodeParameter ("type", "GType"));
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index dbdc7caf3..f1331613f 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1772,7 +1772,7 @@ public class Vala.GTypeModule : GErrorModule {
 				fundamental_class = fundamental_class.base_class;
 			}
 
-			var func = new CCodeFunction ("%s_finalize".printf (get_ccode_lower_case_name (cl, null)));
+			var func = new CCodeFunction ("%sfinalize".printf (get_ccode_lower_case_prefix (cl)));
 			func.add_parameter (new CCodeParameter ("obj", "%s *".printf (get_ccode_name (fundamental_class))));
 			func.modifiers = CCodeModifiers.STATIC;
 
diff --git a/libvaladoc/api/class.vala b/libvaladoc/api/class.vala
index 9c003e8ab..f4b8648c4 100644
--- a/libvaladoc/api/class.vala
+++ b/libvaladoc/api/class.vala
@@ -69,7 +69,7 @@ public class Valadoc.Api.Class : TypeSymbol {
 
 		this.unref_function_name = Vala.get_ccode_unref_function (data);
 		this.ref_function_name = Vala.get_ccode_ref_function (data);
-		this.finalize_function_name = (data.is_fundamental () ? "%s_finalize".printf (Vala.get_ccode_lower_case_name (data, null)) : null);
+		this.finalize_function_name = (data.is_fundamental () ? "%sfinalize".printf (Vala.get_ccode_lower_case_prefix (data)) : null);
 		this.free_function_name = (data.is_compact ? Vala.get_ccode_free_function (data) : null);
 
 		this.take_value_function_cname = Vala.get_ccode_take_value_function (data);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02a0292ab..6892737ec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -339,6 +339,7 @@ TESTS = \
 	delegates/bug772204.test \
 	delegates/bug792077.vala \
 	objects/chainup.vala \
+	objects/class-ccode-cprefix.vala \
 	objects/class_only.vala \
 	objects/class-destroysinstance.vala \
 	objects/class-new-no-override.vala \
diff --git a/tests/objects/class-ccode-cprefix.vala b/tests/objects/class-ccode-cprefix.vala
new file mode 100644
index 000000000..dba5643c2
--- /dev/null
+++ b/tests/objects/class-ccode-cprefix.vala
@@ -0,0 +1,23 @@
+[CCode (lower_case_cprefix = "bar_")]
+public class Foo : Object {
+	public Foo () {
+	}
+
+	construct {
+	}
+
+	~Foo () {
+	}
+}
+
+[CCode (lower_case_cprefix = "baz_")]
+public class Manam {
+	public Manam () {
+	}
+
+	~Manam () {
+	}
+}
+
+void main () {
+}