diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-06-14 08:59:51 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2020-06-14 09:44:34 +0200 |
commit | 6e08f06c9faf8515f76c8079c80b328c0a030d40 (patch) | |
tree | d864da8164d8091900c25f889f06e5af7f763c93 /codegen/valagobjectmodule.vala | |
parent | 485beb1f34bdba917dc035cd29fa871cf0ff9581 (diff) | |
download | vala-6e08f06c9faf8515f76c8079c80b328c0a030d40.tar.gz |
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
Diffstat (limited to 'codegen/valagobjectmodule.vala')
-rw-r--r-- | codegen/valagobjectmodule.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala index 674f18d8a..f095e5e5e 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 */ @@ -484,7 +484,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")); |