-
-
Save oreo639/163a82e6a5348c5aac61e823f91418f7 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Revert: https://gitlab.gnome.org/GNOME/vala/-/commit/7e17c3f812303786302747258b78ee86ff4328f5 | |
| See: https://gitlab.gnome.org/GNOME/vala/-/issues/1573 | |
| --- b/tests/methods/array-length-type.c-expected | |
| +++ a/tests/methods/array-length-type.c-expected | |
| @@ -90,8 +90,8 @@ | |
| gint _manam_length1; | |
| gint __manam_size_; | |
| gint* _manar; | |
| + gint _manar_length1; | |
| + gint __manar_size_; | |
| - guint8 _manar_length1; | |
| - guint8 __manar_size_; | |
| }; | |
| struct _ParamSpecFoo { | |
| --- b/tests/objects/property-array.c-expected | |
| +++ a/tests/objects/property-array.c-expected | |
| @@ -95,9 +95,17 @@ | |
| gint _array_v_length1; | |
| gint __array_v_size_; | |
| Manam** _array_no_length; | |
| + gint _array_no_length_length1; | |
| + gint __array_no_length_size_; | |
| Manam** _array_no_length_v; | |
| + gint _array_no_length_v_length1; | |
| + gint __array_no_length_v_size_; | |
| gchar** _strv; | |
| + gint _strv_length1; | |
| + gint __strv_size_; | |
| gchar** _strv_v; | |
| + gint _strv_v_length1; | |
| + gint __strv_v_size_; | |
| }; | |
| struct _ParamSpecFoo { | |
| @@ -119,9 +127,17 @@ | |
| struct _BarPrivate { | |
| Manam** _array; | |
| + gint _array_length1; | |
| + gint __array_size_; | |
| Manam** _array_v; | |
| + gint _array_v_length1; | |
| + gint __array_v_size_; | |
| gchar** _strv; | |
| + gint _strv_length1; | |
| + gint __strv_size_; | |
| gchar** _strv_v; | |
| + gint _strv_v_length1; | |
| + gint __strv_v_size_; | |
| }; | |
| static gint Foo_private_offset; | |
| @@ -434,7 +450,7 @@ | |
| gint _tmp0__length1; | |
| g_return_val_if_fail (IS_FOO (self), NULL); | |
| _tmp0_ = self->priv->_array_no_length; | |
| + _tmp0__length1 = self->priv->_array_no_length_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_array_no_length); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -466,8 +482,10 @@ | |
| g_return_if_fail (IS_FOO (self)); | |
| _tmp0_ = (value != NULL) ? _vala_array_dup3 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_array_no_length = (_vala_array_free (self->priv->_array_no_length, self->priv->_array_no_length_length1, (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array_no_length = (_vala_array_free (self->priv->_array_no_length, _vala_array_length (self->priv->_array_no_length), (GDestroyNotify) manam_free), NULL); | |
| self->priv->_array_no_length = _tmp0_; | |
| + self->priv->_array_no_length_length1 = _tmp0__length1; | |
| + self->priv->__array_no_length_size_ = self->priv->_array_no_length_length1; | |
| } | |
| Manam** | |
| @@ -491,7 +509,7 @@ | |
| gint _tmp0__length1; | |
| self = base; | |
| _tmp0_ = self->priv->_array_no_length_v; | |
| + _tmp0__length1 = self->priv->_array_no_length_v_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_array_no_length_v); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -536,8 +554,10 @@ | |
| self = base; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup4 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_array_no_length_v = (_vala_array_free (self->priv->_array_no_length_v, self->priv->_array_no_length_v_length1, (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array_no_length_v = (_vala_array_free (self->priv->_array_no_length_v, _vala_array_length (self->priv->_array_no_length_v), (GDestroyNotify) manam_free), NULL); | |
| self->priv->_array_no_length_v = _tmp0_; | |
| + self->priv->_array_no_length_v_length1 = _tmp0__length1; | |
| + self->priv->__array_no_length_v_size_ = self->priv->_array_no_length_v_length1; | |
| } | |
| gchar** | |
| @@ -548,7 +568,7 @@ | |
| gint _tmp0__length1; | |
| g_return_val_if_fail (IS_FOO (self), NULL); | |
| _tmp0_ = self->priv->_strv; | |
| + _tmp0__length1 = self->priv->_strv_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_strv); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -580,8 +600,10 @@ | |
| g_return_if_fail (IS_FOO (self)); | |
| _tmp0_ = (value != NULL) ? _vala_array_dup5 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_strv = (_vala_array_free (self->priv->_strv, self->priv->_strv_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv = (_vala_array_free (self->priv->_strv, _vala_array_length (self->priv->_strv), (GDestroyNotify) g_free), NULL); | |
| self->priv->_strv = _tmp0_; | |
| + self->priv->_strv_length1 = _tmp0__length1; | |
| + self->priv->__strv_size_ = self->priv->_strv_length1; | |
| } | |
| gchar** | |
| @@ -605,7 +627,7 @@ | |
| gint _tmp0__length1; | |
| self = base; | |
| _tmp0_ = self->priv->_strv_v; | |
| + _tmp0__length1 = self->priv->_strv_v_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_strv_v); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -650,8 +672,10 @@ | |
| self = base; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup6 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, self->priv->_strv_v_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, _vala_array_length (self->priv->_strv_v), (GDestroyNotify) g_free), NULL); | |
| self->priv->_strv_v = _tmp0_; | |
| + self->priv->_strv_v_length1 = _tmp0__length1; | |
| + self->priv->__strv_v_size_ = self->priv->_strv_v_length1; | |
| } | |
| static void | |
| @@ -818,10 +842,10 @@ | |
| g_signal_handlers_destroy (self); | |
| self->priv->_array = (_vala_array_free (self->priv->_array, self->priv->_array_length1, (GDestroyNotify) manam_free), NULL); | |
| self->priv->_array_v = (_vala_array_free (self->priv->_array_v, self->priv->_array_v_length1, (GDestroyNotify) manam_free), NULL); | |
| + self->priv->_array_no_length = (_vala_array_free (self->priv->_array_no_length, self->priv->_array_no_length_length1, (GDestroyNotify) manam_free), NULL); | |
| + self->priv->_array_no_length_v = (_vala_array_free (self->priv->_array_no_length_v, self->priv->_array_no_length_v_length1, (GDestroyNotify) manam_free), NULL); | |
| + self->priv->_strv = (_vala_array_free (self->priv->_strv, self->priv->_strv_length1, (GDestroyNotify) g_free), NULL); | |
| + self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, self->priv->_strv_v_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_array_no_length = (_vala_array_free (self->priv->_array_no_length, _vala_array_length (self->priv->_array_no_length), (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array_no_length_v = (_vala_array_free (self->priv->_array_no_length_v, _vala_array_length (self->priv->_array_no_length_v), (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_strv = (_vala_array_free (self->priv->_strv, _vala_array_length (self->priv->_strv), (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, _vala_array_length (self->priv->_strv_v), (GDestroyNotify) g_free), NULL); | |
| } | |
| static GType | |
| @@ -896,7 +920,7 @@ | |
| gint _tmp0__length1; | |
| g_return_val_if_fail (IS_BAR (self), NULL); | |
| _tmp0_ = self->priv->_array; | |
| + _tmp0__length1 = self->priv->_array_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_array); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -931,8 +955,10 @@ | |
| gint _tmp0__length1; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup7 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_array = (_vala_array_free (self->priv->_array, self->priv->_array_length1, (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array = (_vala_array_free (self->priv->_array, _vala_array_length (self->priv->_array), (GDestroyNotify) manam_free), NULL); | |
| self->priv->_array = _tmp0_; | |
| + self->priv->_array_length1 = _tmp0__length1; | |
| + self->priv->__array_size_ = self->priv->_array_length1; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_ARRAY_PROPERTY]); | |
| } | |
| } | |
| @@ -958,7 +984,7 @@ | |
| gint _tmp0__length1; | |
| self = base; | |
| _tmp0_ = self->priv->_array_v; | |
| + _tmp0__length1 = self->priv->_array_v_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_array_v); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -1006,8 +1032,10 @@ | |
| gint _tmp0__length1; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup8 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_array_v = (_vala_array_free (self->priv->_array_v, self->priv->_array_v_length1, (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array_v = (_vala_array_free (self->priv->_array_v, _vala_array_length (self->priv->_array_v), (GDestroyNotify) manam_free), NULL); | |
| self->priv->_array_v = _tmp0_; | |
| + self->priv->_array_v_length1 = _tmp0__length1; | |
| + self->priv->__array_v_size_ = self->priv->_array_v_length1; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_ARRAY_V_PROPERTY]); | |
| } | |
| } | |
| @@ -1020,7 +1048,7 @@ | |
| gint _tmp0__length1; | |
| g_return_val_if_fail (IS_BAR (self), NULL); | |
| _tmp0_ = self->priv->_strv; | |
| + _tmp0__length1 = self->priv->_strv_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_strv); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -1055,8 +1083,10 @@ | |
| gint _tmp0__length1; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup9 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_strv = (_vala_array_free (self->priv->_strv, self->priv->_strv_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv = (_vala_array_free (self->priv->_strv, _vala_array_length (self->priv->_strv), (GDestroyNotify) g_free), NULL); | |
| self->priv->_strv = _tmp0_; | |
| + self->priv->_strv_length1 = _tmp0__length1; | |
| + self->priv->__strv_size_ = self->priv->_strv_length1; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_STRV_PROPERTY]); | |
| } | |
| } | |
| @@ -1082,7 +1112,7 @@ | |
| gint _tmp0__length1; | |
| self = base; | |
| _tmp0_ = self->priv->_strv_v; | |
| + _tmp0__length1 = self->priv->_strv_v_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_strv_v); | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -1130,8 +1160,10 @@ | |
| gint _tmp0__length1; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup10 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, self->priv->_strv_v_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, _vala_array_length (self->priv->_strv_v), (GDestroyNotify) g_free), NULL); | |
| self->priv->_strv_v = _tmp0_; | |
| + self->priv->_strv_v_length1 = _tmp0__length1; | |
| + self->priv->__strv_v_size_ = self->priv->_strv_v_length1; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_STRV_V_PROPERTY]); | |
| } | |
| } | |
| @@ -1167,10 +1199,10 @@ | |
| { | |
| Bar * self; | |
| self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BAR, Bar); | |
| + self->priv->_array = (_vala_array_free (self->priv->_array, self->priv->_array_length1, (GDestroyNotify) manam_free), NULL); | |
| + self->priv->_array_v = (_vala_array_free (self->priv->_array_v, self->priv->_array_v_length1, (GDestroyNotify) manam_free), NULL); | |
| + self->priv->_strv = (_vala_array_free (self->priv->_strv, self->priv->_strv_length1, (GDestroyNotify) g_free), NULL); | |
| + self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, self->priv->_strv_v_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_array = (_vala_array_free (self->priv->_array, _vala_array_length (self->priv->_array), (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_array_v = (_vala_array_free (self->priv->_array_v, _vala_array_length (self->priv->_array_v), (GDestroyNotify) manam_free), NULL); | |
| - self->priv->_strv = (_vala_array_free (self->priv->_strv, _vala_array_length (self->priv->_strv), (GDestroyNotify) g_free), NULL); | |
| - self->priv->_strv_v = (_vala_array_free (self->priv->_strv_v, _vala_array_length (self->priv->_strv_v), (GDestroyNotify) g_free), NULL); | |
| G_OBJECT_CLASS (bar_parent_class)->finalize (obj); | |
| } | |
| --- b/tests/objects/property-delegate.c-expected | |
| +++ a/tests/objects/property-delegate.c-expected | |
| @@ -86,7 +86,11 @@ | |
| gpointer _deleg_v_target; | |
| GDestroyNotify _deleg_v_target_destroy_notify; | |
| Manam _deleg_no_target; | |
| + gpointer _deleg_no_target_target; | |
| + GDestroyNotify _deleg_no_target_target_destroy_notify; | |
| Manam _deleg_no_target_v; | |
| + gpointer _deleg_no_target_v_target; | |
| + GDestroyNotify _deleg_no_target_v_target_destroy_notify; | |
| }; | |
| struct _ParamSpecFoo { | |
| @@ -106,7 +110,11 @@ | |
| struct _BarPrivate { | |
| Manam _deleg; | |
| + gpointer _deleg_target; | |
| + GDestroyNotify _deleg_target_destroy_notify; | |
| Manam _deleg_v; | |
| + gpointer _deleg_v_target; | |
| + GDestroyNotify _deleg_v_target_destroy_notify; | |
| }; | |
| static gint Foo_private_offset; | |
| @@ -295,7 +303,7 @@ | |
| gpointer _tmp0__target; | |
| g_return_val_if_fail (IS_FOO (self), NULL); | |
| _tmp0_ = self->priv->_deleg_no_target; | |
| + _tmp0__target = self->priv->_deleg_no_target_target; | |
| - _tmp0__target = NULL; | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -305,7 +313,13 @@ | |
| Manam value) | |
| { | |
| g_return_if_fail (IS_FOO (self)); | |
| + (self->priv->_deleg_no_target_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_no_target_target_destroy_notify (self->priv->_deleg_no_target_target), NULL); | |
| + self->priv->_deleg_no_target = NULL; | |
| + self->priv->_deleg_no_target_target = NULL; | |
| + self->priv->_deleg_no_target_target_destroy_notify = NULL; | |
| self->priv->_deleg_no_target = value; | |
| + self->priv->_deleg_no_target_target = NULL; | |
| + self->priv->_deleg_no_target_target_destroy_notify = NULL; | |
| } | |
| Manam | |
| @@ -329,7 +343,7 @@ | |
| gpointer _tmp0__target; | |
| self = base; | |
| _tmp0_ = self->priv->_deleg_no_target_v; | |
| + _tmp0__target = self->priv->_deleg_no_target_v_target; | |
| - _tmp0__target = NULL; | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -352,7 +366,13 @@ | |
| { | |
| Foo* self; | |
| self = base; | |
| + (self->priv->_deleg_no_target_v_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_no_target_v_target_destroy_notify (self->priv->_deleg_no_target_v_target), NULL); | |
| + self->priv->_deleg_no_target_v = NULL; | |
| + self->priv->_deleg_no_target_v_target = NULL; | |
| + self->priv->_deleg_no_target_v_target_destroy_notify = NULL; | |
| self->priv->_deleg_no_target_v = value; | |
| + self->priv->_deleg_no_target_v_target = NULL; | |
| + self->priv->_deleg_no_target_v_target_destroy_notify = NULL; | |
| } | |
| static void | |
| @@ -523,6 +543,14 @@ | |
| self->priv->_deleg_v = NULL; | |
| self->priv->_deleg_v_target = NULL; | |
| self->priv->_deleg_v_target_destroy_notify = NULL; | |
| + (self->priv->_deleg_no_target_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_no_target_target_destroy_notify (self->priv->_deleg_no_target_target), NULL); | |
| + self->priv->_deleg_no_target = NULL; | |
| + self->priv->_deleg_no_target_target = NULL; | |
| + self->priv->_deleg_no_target_target_destroy_notify = NULL; | |
| + (self->priv->_deleg_no_target_v_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_no_target_v_target_destroy_notify (self->priv->_deleg_no_target_v_target), NULL); | |
| + self->priv->_deleg_no_target_v = NULL; | |
| + self->priv->_deleg_no_target_v_target = NULL; | |
| + self->priv->_deleg_no_target_v_target_destroy_notify = NULL; | |
| } | |
| static GType | |
| @@ -597,7 +625,7 @@ | |
| gpointer _tmp0__target; | |
| g_return_val_if_fail (IS_BAR (self), NULL); | |
| _tmp0_ = self->priv->_deleg; | |
| + _tmp0__target = self->priv->_deleg_target; | |
| - _tmp0__target = NULL; | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -610,7 +638,13 @@ | |
| g_return_if_fail (IS_BAR (self)); | |
| old_value = bar_get_deleg (self); | |
| if (old_value != value) { | |
| + (self->priv->_deleg_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_target_destroy_notify (self->priv->_deleg_target), NULL); | |
| + self->priv->_deleg = NULL; | |
| + self->priv->_deleg_target = NULL; | |
| + self->priv->_deleg_target_destroy_notify = NULL; | |
| self->priv->_deleg = value; | |
| + self->priv->_deleg_target = NULL; | |
| + self->priv->_deleg_target_destroy_notify = NULL; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_DELEG_PROPERTY]); | |
| } | |
| } | |
| @@ -636,7 +670,7 @@ | |
| gpointer _tmp0__target; | |
| self = base; | |
| _tmp0_ = self->priv->_deleg_v; | |
| + _tmp0__target = self->priv->_deleg_v_target; | |
| - _tmp0__target = NULL; | |
| result = _tmp0_; | |
| return result; | |
| } | |
| @@ -662,7 +696,13 @@ | |
| self = base; | |
| old_value = bar_real_get_deleg_v (base); | |
| if (old_value != value) { | |
| + (self->priv->_deleg_v_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_v_target_destroy_notify (self->priv->_deleg_v_target), NULL); | |
| + self->priv->_deleg_v = NULL; | |
| + self->priv->_deleg_v_target = NULL; | |
| + self->priv->_deleg_v_target_destroy_notify = NULL; | |
| self->priv->_deleg_v = value; | |
| + self->priv->_deleg_v_target = NULL; | |
| + self->priv->_deleg_v_target_destroy_notify = NULL; | |
| g_object_notify_by_pspec ((GObject *) self, bar_properties[BAR_DELEG_V_PROPERTY]); | |
| } | |
| } | |
| @@ -694,6 +734,14 @@ | |
| { | |
| Bar * self; | |
| self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BAR, Bar); | |
| + (self->priv->_deleg_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_target_destroy_notify (self->priv->_deleg_target), NULL); | |
| + self->priv->_deleg = NULL; | |
| + self->priv->_deleg_target = NULL; | |
| + self->priv->_deleg_target_destroy_notify = NULL; | |
| + (self->priv->_deleg_v_target_destroy_notify == NULL) ? NULL : (self->priv->_deleg_v_target_destroy_notify (self->priv->_deleg_v_target), NULL); | |
| + self->priv->_deleg_v = NULL; | |
| + self->priv->_deleg_v_target = NULL; | |
| + self->priv->_deleg_v_target_destroy_notify = NULL; | |
| G_OBJECT_CLASS (bar_parent_class)->finalize (obj); | |
| } | |
| --- b/tests/objects/property-strv-noaccessor.c-expected | |
| +++ a/tests/objects/property-strv-noaccessor.c-expected | |
| @@ -57,6 +57,8 @@ | |
| struct _FooPrivate { | |
| gchar** _bar; | |
| + gint _bar_length1; | |
| + gint __bar_size_; | |
| }; | |
| static gint Foo_private_offset; | |
| @@ -140,7 +142,7 @@ | |
| gint _tmp1__length1; | |
| g_return_val_if_fail (IS_FOO (self), NULL); | |
| _tmp0_ = self->priv->_bar; | |
| + _tmp0__length1 = self->priv->_bar_length1; | |
| - _tmp0__length1 = _vala_array_length (self->priv->_bar); | |
| _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : _tmp0_; | |
| _tmp1__length1 = _tmp0__length1; | |
| result = _tmp1_; | |
| @@ -177,8 +179,10 @@ | |
| gint _tmp0__length1; | |
| _tmp0_ = (value != NULL) ? _vala_array_dup2 (value, _vala_array_length (value)) : value; | |
| _tmp0__length1 = _vala_array_length (value); | |
| + self->priv->_bar = (_vala_array_free (self->priv->_bar, self->priv->_bar_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_bar = (_vala_array_free (self->priv->_bar, _vala_array_length (self->priv->_bar), (GDestroyNotify) g_free), NULL); | |
| self->priv->_bar = _tmp0_; | |
| + self->priv->_bar_length1 = _tmp0__length1; | |
| + self->priv->__bar_size_ = self->priv->_bar_length1; | |
| g_object_notify_by_pspec ((GObject *) self, foo_properties[FOO_BAR_PROPERTY]); | |
| } | |
| old_value = (g_free (old_value), NULL); | |
| @@ -208,7 +212,7 @@ | |
| { | |
| Foo * self; | |
| self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FOO, Foo); | |
| + self->priv->_bar = (_vala_array_free (self->priv->_bar, self->priv->_bar_length1, (GDestroyNotify) g_free), NULL); | |
| - self->priv->_bar = (_vala_array_free (self->priv->_bar, _vala_array_length (self->priv->_bar), (GDestroyNotify) g_free), NULL); | |
| G_OBJECT_CLASS (foo_parent_class)->finalize (obj); | |
| } | |
| --- b/vala/valaproperty.vala | |
| +++ a/vala/valaproperty.vala | |
| @@ -130,11 +130,6 @@ | |
| _field.set_attribute_string ("GtkChild", "name", get_attribute_string ("GtkChild", "name", name)); | |
| _field.set_attribute_bool ("GtkChild", "internal", get_attribute_bool ("GtkChild", "internal")); | |
| } | |
| - // Inherit important attributes | |
| - _field.copy_attribute_bool (this, "CCode", "array_length"); | |
| - _field.copy_attribute_string (this, "CCode", "array_length_type"); | |
| - _field.copy_attribute_bool (this, "CCode", "array_null_terminated"); | |
| - _field.copy_attribute_bool (this, "CCode", "delegate_target"); | |
| } | |
| } | |
| _field_checked = true; | |
| --- b/vala/valaproperty.c | |
| +++ a/vala/valaproperty.c | |
| @@ -284,7 +284,7 @@ ValaField* | |
| vala_property_get_field (ValaProperty* self) | |
| { | |
| ValaField* result; | |
| - ValaField* _tmp62_; | |
| + ValaField* _tmp58_; | |
| g_return_val_if_fail (self != NULL, NULL); | |
| if (!self->priv->_field_checked) { | |
| gboolean _tmp0_ = FALSE; | |
| @@ -408,10 +408,6 @@ vala_property_get_field (ValaProperty* s | |
| ValaField* _tmp49_; | |
| ValaField* _tmp50_; | |
| ValaMemberBinding _tmp51_; | |
| - ValaField* _tmp58_; | |
| - ValaField* _tmp59_; | |
| - ValaField* _tmp60_; | |
| - ValaField* _tmp61_; | |
| if (vala_code_node_has_attribute ((ValaCodeNode*) self, "GtkChild")) { | |
| ValaDataType* _tmp28_; | |
| ValaDataType* _tmp29_; | |
| @@ -476,20 +472,12 @@ vala_property_get_field (ValaProperty* s | |
| _tmp57_ = self->priv->_field; | |
| vala_code_node_set_attribute_bool ((ValaCodeNode*) _tmp57_, "GtkChild", "internal", vala_code_node_get_attribute_bool ((ValaCodeNode*) self, "GtkChild", "internal", FALSE), NULL); | |
| } | |
| - _tmp58_ = self->priv->_field; | |
| - vala_code_node_copy_attribute_bool ((ValaCodeNode*) _tmp58_, (ValaCodeNode*) self, "CCode", "array_length"); | |
| - _tmp59_ = self->priv->_field; | |
| - vala_code_node_copy_attribute_string ((ValaCodeNode*) _tmp59_, (ValaCodeNode*) self, "CCode", "array_length_type"); | |
| - _tmp60_ = self->priv->_field; | |
| - vala_code_node_copy_attribute_bool ((ValaCodeNode*) _tmp60_, (ValaCodeNode*) self, "CCode", "array_null_terminated"); | |
| - _tmp61_ = self->priv->_field; | |
| - vala_code_node_copy_attribute_bool ((ValaCodeNode*) _tmp61_, (ValaCodeNode*) self, "CCode", "delegate_target"); | |
| } | |
| } | |
| self->priv->_field_checked = TRUE; | |
| } | |
| - _tmp62_ = self->priv->_field; | |
| - result = _tmp62_; | |
| + _tmp58_ = self->priv->_field; | |
| + result = _tmp58_; | |
| return result; | |
| } | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment