diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-10-25 13:10:41 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-10-26 10:07:06 +0200 |
| commit | 05d0d7bbc1f022c3f7fe8d67f99fccc737c3e286 (patch) | |
| tree | a95d2091d07938a76d132c81e0609f3b3cc1e531 | |
| parent | 93329cecdddf3d74c4871fb05e22764df16776e7 (diff) | |
| download | vala-05d0d7bbc1f022c3f7fe8d67f99fccc737c3e286.tar.gz | |
codegen: Avoid possible conflicts with internal property/signal defines
https://bugzilla.gnome.org/show_bug.cgi?id=788964
| -rw-r--r-- | codegen/valagtypemodule.vala | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/objects/bug788964.vala | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala index 86a6474a1..e8ba03691 100644 --- a/codegen/valagtypemodule.vala +++ b/codegen/valagtypemodule.vala @@ -554,7 +554,7 @@ public class Vala.GTypeModule : GErrorModule { } prop_enum = new CCodeEnum (); - prop_enum.add_value (new CCodeEnumValue ("%s_DUMMY_PROPERTY".printf (get_ccode_upper_case_name (cl, null)))); + prop_enum.add_value (new CCodeEnumValue ("%s_0_PROPERTY".printf (get_ccode_upper_case_name (cl, null)))); signal_enum = new CCodeEnum (); class_init_context = new EmitContext (cl); base_init_context = new EmitContext (cl); @@ -620,7 +620,7 @@ public class Vala.GTypeModule : GErrorModule { } if (cl.get_signals ().size > 0) { - var last_signal = "%s_LAST_SIGNAL".printf (get_ccode_upper_case_name (cl)); + var last_signal = "%s_NUM_SIGNALS".printf (get_ccode_upper_case_name (cl)); signal_enum.add_value (new CCodeEnumValue (last_signal)); cfile.add_type_declaration (signal_enum); @@ -2072,7 +2072,7 @@ public class Vala.GTypeModule : GErrorModule { iface.accept_children (this); if (iface.get_signals ().size > 0) { - var last_signal = "%s_LAST_SIGNAL".printf (get_ccode_upper_case_name (iface)); + var last_signal = "%s_NUM_SIGNALS".printf (get_ccode_upper_case_name (iface)); signal_enum.add_value (new CCodeEnumValue (last_signal)); cfile.add_type_declaration (signal_enum); diff --git a/tests/Makefile.am b/tests/Makefile.am index 3f9f0c72e..163c42221 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -238,6 +238,7 @@ TESTS = \ objects/bug779219.vala \ objects/bug779955.vala \ objects/bug783897.vala \ + objects/bug788964.vala \ errors/errors.vala \ errors/bug567181.vala \ errors/bug579101.vala \ diff --git a/tests/objects/bug788964.vala b/tests/objects/bug788964.vala new file mode 100644 index 000000000..4865568df --- /dev/null +++ b/tests/objects/bug788964.vala @@ -0,0 +1,11 @@ +public class Foo : Object { + public signal void last (); +} + +public class Bar : Object { + public string dummy { get; set; } + public string last { get; set; } +} + +void main () { +} |