WIP tests: Regenerate c-expected

diff --git a/tests/genie/attributes.c-expected b/tests/genie/attributes.c-expected
index 53b456fabd4c30761bc82d4d2893520b9223e23a..e8aa6bead5465783469a166874e8484ab5a850ce 100644 (file)
--- a/tests/genie/attributes.c-expected
+++ b/tests/genie/attributes.c-expected
@@ -108,9 +108,9 @@ VALA_EXTERN gint c_test1_method (Test1* self,
                      gint c_b);
 VALA_EXTERN Test1* test1_new (void);
 VALA_EXTERN Test1* test1_construct (GType object_type);
-VALA_EXTERN gint test1_get_test1_prop (Test1* self);
-VALA_EXTERN void test1_set_test1_prop (Test1* self,
-                           gint value);
+VALA_EXTERN gint test1_get_c_test1_prop (Test1* self);
+VALA_EXTERN void test1_set_c_test1_prop (Test1* self,
+                             gint value);
 static void test1_finalize (Test1 * obj);
 static GType test1_get_type_once (void);
 VALA_EXTERN gpointer test2_ref (gpointer instance);
@@ -132,9 +132,9 @@ VALA_EXTERN gint c_test2_method (Test2* self,
                      gint c_b);
 VALA_EXTERN Test2* test2_new (void);
 VALA_EXTERN Test2* test2_construct (GType object_type);
-VALA_EXTERN gint test2_get_test2_prop (Test2* self);
-VALA_EXTERN void test2_set_test2_prop (Test2* self,
-                           gint value);
+VALA_EXTERN gint test2_get_c_test2_prop (Test2* self);
+VALA_EXTERN void test2_set_c_test2_prop (Test2* self,
+                             gint value);
 static void test2_finalize (Test2 * obj);
 static GType test2_get_type_once (void);
 static void _vala_main (gchar** args,
@@ -172,7 +172,7 @@ test1_new (void)
 }
 
 gint
-test1_get_test1_prop (Test1* self)
+test1_get_c_test1_prop (Test1* self)
 {
        gint result;
        g_return_val_if_fail (IS_TEST1 (self), 0);
@@ -181,8 +181,8 @@ test1_get_test1_prop (Test1* self)
 }
 
 void
-test1_set_test1_prop (Test1* self,
-                      gint value)
+test1_set_c_test1_prop (Test1* self,
+                        gint value)
 {
        g_return_if_fail (IS_TEST1 (self));
        self->priv->_test1_prop = value;
@@ -424,7 +424,7 @@ test2_new (void)
 }
 
 gint
-test2_get_test2_prop (Test2* self)
+test2_get_c_test2_prop (Test2* self)
 {
        gint result;
        g_return_val_if_fail (IS_TEST2 (self), 0);
@@ -433,8 +433,8 @@ test2_get_test2_prop (Test2* self)
 }
 
 void
-test2_set_test2_prop (Test2* self,
-                      gint value)
+test2_set_c_test2_prop (Test2* self,
+                        gint value)
 {
        g_return_if_fail (IS_TEST2 (self));
        self->priv->_test2_prop = value;
@@ -678,7 +678,7 @@ _vala_main (gchar** args,
        test2 = _tmp1_;
        _tmp2_ = g_strdup_printf ("%i", test1->c_test1_field);
        _tmp3_ = _tmp2_;
-       _tmp4_ = test1_get_test1_prop (test1);
+       _tmp4_ = test1_get_c_test1_prop (test1);
        _tmp5_ = _tmp4_;
        _tmp6_ = g_strdup_printf ("%i", _tmp5_);
        _tmp7_ = _tmp6_;
@@ -693,7 +693,7 @@ _vala_main (gchar** args,
        _g_free0 (_tmp3_);
        _tmp12_ = g_strdup_printf ("%i", test2->c_test2_field);
        _tmp13_ = _tmp12_;
-       _tmp14_ = test2_get_test2_prop (test2);
+       _tmp14_ = test2_get_c_test2_prop (test2);
        _tmp15_ = _tmp14_;
        _tmp16_ = g_strdup_printf ("%i", _tmp15_);
        _tmp17_ = _tmp16_;

diff --git a/tests/objects/property-dynamic-type-inference.c-expected b/tests/objects/property-dynamic-type-inference.c-expected
index fd323761d733912c386f6164dc0298ae29e3765c..9feaf6fb913e0c8d180bd396f6d82f52ff2380fa 100644 (file)
--- a/tests/objects/property-dynamic-type-inference.c-expected
+++ b/tests/objects/property-dynamic-type-inference.c-expected
@@ -56,9 +56,9 @@ VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref)
 VALA_EXTERN Foo* foo_new (void);
 VALA_EXTERN Foo* foo_construct (GType object_type);
-VALA_EXTERN Foo* foo_get_bar (Foo* self);
-VALA_EXTERN void foo_set_bar (Foo* self,
-                  Foo* value);
+VALA_EXTERN Foo* foo_get_manam (Foo* self);
+VALA_EXTERN void foo_set_manam (Foo* self,
+                    Foo* value);
 static void foo_finalize (GObject * obj);
 static GType foo_get_type_once (void);
 static void _vala_foo_get_property (GObject * object,
@@ -98,7 +98,7 @@ _g_object_ref0 (gpointer self)
 }
 
 Foo*
-foo_get_bar (Foo* self)
+foo_get_manam (Foo* self)
 {
        Foo* result;
        Foo* _tmp0_;
@@ -111,12 +111,12 @@ foo_get_bar (Foo* self)
 }
 
 void
-foo_set_bar (Foo* self,
-             Foo* value)
+foo_set_manam (Foo* self,
+               Foo* value)
 {
        Foo* old_value;
        g_return_if_fail (IS_FOO (self));
-       old_value = foo_get_bar (self);
+       old_value = foo_get_manam (self);
        if (old_value != value) {
                Foo* _tmp0_;
                _tmp0_ = _g_object_ref0 (value);
@@ -187,7 +187,7 @@ _vala_foo_get_property (GObject * object,
        self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_FOO, Foo);
        switch (property_id) {
                case FOO_BAR_PROPERTY:
-               g_value_take_object (value, foo_get_bar (self));
+               g_value_take_object (value, foo_get_manam (self));
                break;
                default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -205,7 +205,7 @@ _vala_foo_set_property (GObject * object,
        self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_FOO, Foo);
        switch (property_id) {
                case FOO_BAR_PROPERTY:
-               foo_set_bar (self, g_value_get_object (value));
+               foo_set_manam (self, g_value_get_object (value));
                break;
                default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -266,7 +266,7 @@ _vala_main (void)
        _g_object_unref0 (dfoo);
        dfoo = NULL;
        _tmp16_ = foo;
-       foo_set_bar (_tmp16_, NULL);
+       foo_set_manam (_tmp16_, NULL);
        _tmp17_ = foo;
        _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1");
        _g_object_unref0 (dfoo);

diff --git a/tests/parser/var-type-dynamic.c-expected b/tests/parser/var-type-dynamic.c-expected
index 9411215b94d1055e79a8e859681a30119f6a7cb6..bdba331a130e5ed3c2b8f9178653bfb37d705f54 100644 (file)
--- a/tests/parser/var-type-dynamic.c-expected
+++ b/tests/parser/var-type-dynamic.c-expected
@@ -59,9 +59,9 @@ VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ;
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref)
 VALA_EXTERN Foo* foo_new (void);
 VALA_EXTERN Foo* foo_construct (GType object_type);
-VALA_EXTERN gchar* foo_get_bar (Foo* self);
-VALA_EXTERN void foo_set_bar (Foo* self,
-                  const gchar* value);
+VALA_EXTERN gchar* foo_get_manam (Foo* self);
+VALA_EXTERN void foo_set_manam (Foo* self,
+                    const gchar* value);
 static void foo_finalize (GObject * obj);
 static GType foo_get_type_once (void);
 static void _vala_foo_get_property (GObject * object,
@@ -97,7 +97,7 @@ foo_new (void)
 }
 
 gchar*
-foo_get_bar (Foo* self)
+foo_get_manam (Foo* self)
 {
        gchar* result;
        const gchar* _tmp0_;
@@ -110,12 +110,12 @@ foo_get_bar (Foo* self)
 }
 
 void
-foo_set_bar (Foo* self,
-             const gchar* value)
+foo_set_manam (Foo* self,
+               const gchar* value)
 {
        gchar* old_value;
        g_return_if_fail (IS_FOO (self));
-       old_value = foo_get_bar (self);
+       old_value = foo_get_manam (self);
        if (g_strcmp0 (value, old_value) != 0) {
                gchar* _tmp0_;
                _tmp0_ = g_strdup (value);
@@ -189,7 +189,7 @@ _vala_foo_get_property (GObject * object,
        self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_FOO, Foo);
        switch (property_id) {
                case FOO_BAR_PROPERTY:
-               g_value_take_string (value, foo_get_bar (self));
+               g_value_take_string (value, foo_get_manam (self));
                break;
                default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -207,7 +207,7 @@ _vala_foo_set_property (GObject * object,
        self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_FOO, Foo);
        switch (property_id) {
                case FOO_BAR_PROPERTY:
-               foo_set_bar (self, g_value_get_string (value));
+               foo_set_manam (self, g_value_get_string (value));
                break;
                default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);