codegen: Try to use a more unique internal define for properties

https://bugzilla.gnome.org/show_bug.cgi?id=787436

diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
index 33bb87805dc0c11748f59b53e4ce28626536cce1..8b3e7a2693455b5f51cc260d33ad8c6dfbe8ea4f 100644 (file)
--- a/codegen/valagobjectmodule.vala
+++ b/codegen/valagobjectmodule.vala
@@ -144,7 +144,7 @@ public class Vala.GObjectModule : GTypeModule {
 
                        var cinst = new CCodeFunctionCall (new CCodeIdentifier ("g_object_class_install_property"));
                        cinst.add_argument (ccall);
-                       cinst.add_argument (new CCodeConstant (get_ccode_upper_case_name (prop)));
+                       cinst.add_argument (new CCodeConstant ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))));
                        cinst.add_argument (get_param_spec (prop));
 
                        ccode.add_expression (cinst);
@@ -228,7 +228,7 @@ public class Vala.GObjectModule : GTypeModule {
                                cfunc = new CCodeIdentifier (get_ccode_real_name (prop.get_accessor));
                        }
 
-                       ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop)));
+                       ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))));
                        if (prop.property_type.is_real_struct_type ()) {
                                var st = prop.property_type.data_type as Struct;
 
@@ -335,7 +335,7 @@ public class Vala.GObjectModule : GTypeModule {
                                cfunc = new CCodeIdentifier (get_ccode_real_name (prop.set_accessor));
                        }
 
-                       ccode.add_case (new CCodeIdentifier (get_ccode_upper_case_name (prop)));
+                       ccode.add_case (new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))));
                        ccall = new CCodeFunctionCall (cfunc);
                        ccall.add_argument (cself);
                        if (prop.property_type is ArrayType && ((ArrayType)prop.property_type).element_type.data_type == string_type.data_type) {
@@ -684,7 +684,7 @@ public class Vala.GObjectModule : GTypeModule {
                base.visit_property (prop);
 
                if (is_gobject_property (prop) && prop.parent_symbol is Class) {
-                       prop_enum.add_value (new CCodeEnumValue (get_ccode_upper_case_name (prop)));
+                       prop_enum.add_value (new CCodeEnumValue ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop))));
 
                        if (prop.initializer != null && prop.set_accessor != null && !prop.set_accessor.automatic_body) {
                                // generate a custom initializer if it couldn't be done at class_init time

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 6d0f0d2ebfee8e2c631ab2b63aa451111727cea6..e75036041f3bab3b319c368a06a8453e39ba8116 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1732,7 +1732,7 @@ public class Vala.GTypeModule : GErrorModule {
        public override CCodeExpression get_param_spec_cexpression (Property prop) {
                var cl = (TypeSymbol) prop.parent_symbol;
                var prop_array = new CCodeIdentifier ("%s_properties".printf (get_ccode_lower_case_name (cl)));
-               var prop_enum_value = new CCodeIdentifier (get_ccode_upper_case_name (prop));
+               var prop_enum_value = new CCodeIdentifier ("%s_PROPERTY".printf (get_ccode_upper_case_name (prop)));
 
                return new CCodeElementAccess (prop_array, prop_enum_value);
        }