diff options
Diffstat (limited to 'tests/objects')
25 files changed, 480 insertions, 480 deletions
diff --git a/tests/objects/bug566909.c-expected b/tests/objects/bug566909.c-expected index 7fd25eeb4..320fd30ca 100644 --- a/tests/objects/bug566909.c-expected +++ b/tests/objects/bug566909.c-expected @@ -70,15 +70,15 @@ static GType maman_foo_get_type_once (void); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__maman_foo_bar (MamanFoo* _sender, - gpointer self); -static void __lambda5_ (Block1Data* _data1_); -static void ___lambda5__maman_foo_bar (MamanFoo* _sender, - gpointer self); -static void __lambda6_ (Block1Data* _data1_); -static void ___lambda6__maman_foo_bar (MamanFoo* _sender, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__maman_foo_bar (MamanFoo* _sender, + gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_); +static void __vala_lambda1__maman_foo_bar (MamanFoo* _sender, + gpointer self); +static void _vala_lambda2_ (Block1Data* _data1_); +static void __vala_lambda2__maman_foo_bar (MamanFoo* _sender, + gpointer self); MamanFoo* maman_foo_construct (GType object_type) @@ -147,42 +147,42 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _data1_->detailed1 = TRUE; } static void -___lambda4__maman_foo_bar (MamanFoo* _sender, - gpointer self) +__vala_lambda0__maman_foo_bar (MamanFoo* _sender, + gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void -__lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { _data1_->detailed2 = TRUE; } static void -___lambda5__maman_foo_bar (MamanFoo* _sender, - gpointer self) +__vala_lambda1__maman_foo_bar (MamanFoo* _sender, + gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); } static void -__lambda6_ (Block1Data* _data1_) +_vala_lambda2_ (Block1Data* _data1_) { _data1_->detailed3 = TRUE; } static void -___lambda6__maman_foo_bar (MamanFoo* _sender, - gpointer self) +__vala_lambda2__maman_foo_bar (MamanFoo* _sender, + gpointer self) { - __lambda6_ (self); + _vala_lambda2_ (self); } static void @@ -223,15 +223,15 @@ _vala_main (void) _tmp3_ = foo; _tmp4_ = detail1; _tmp5_ = g_strconcat ("bar::", _tmp4_, NULL); - g_signal_connect_data (_tmp3_, _tmp5_, (GCallback) ___lambda4__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_tmp3_, _tmp5_, (GCallback) __vala_lambda0__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _g_free0 (_tmp5_); _tmp6_ = foo; _tmp7_ = detail2; _tmp8_ = g_strconcat ("bar::", _tmp7_, NULL); - g_signal_connect_data (_tmp6_, _tmp8_, (GCallback) ___lambda5__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_tmp6_, _tmp8_, (GCallback) __vala_lambda1__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _g_free0 (_tmp8_); _tmp9_ = foo; - g_signal_connect_data (_tmp9_, "bar::detail3", (GCallback) ___lambda6__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_tmp9_, "bar::detail3", (GCallback) __vala_lambda2__maman_foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _tmp10_ = foo; _tmp11_ = detail1; g_signal_emit (_tmp10_, maman_foo_signals[MAMAN_FOO_BAR_SIGNAL], g_quark_from_string (_tmp11_)); diff --git a/tests/objects/bug597155.c-expected b/tests/objects/bug597155.c-expected index 2546fb89e..51c28d0aa 100644 --- a/tests/objects/bug597155.c-expected +++ b/tests/objects/bug597155.c-expected @@ -65,9 +65,9 @@ static GType foo_get_type_once (void); VALA_EXTERN Foo* do_foo (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__foo_bar (Foo* _sender, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__foo_bar (Foo* _sender, + gpointer self); static void _vala_main (void); Foo* @@ -138,16 +138,16 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _vala_assert (IS_FOO (_data1_->foo), "foo is Foo"); } static void -___lambda4__foo_bar (Foo* _sender, - gpointer self) +__vala_lambda0__foo_bar (Foo* _sender, + gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static gpointer @@ -167,7 +167,7 @@ do_foo (void) _data1_->_ref_count_ = 1; _tmp0_ = foo_new (); _data1_->foo = _tmp0_; - g_signal_connect_data (_data1_->foo, "bar", (GCallback) ___lambda4__foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_data1_->foo, "bar", (GCallback) __vala_lambda0__foo_bar, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _tmp1_ = _g_object_ref0 (_data1_->foo); result = _tmp1_; block1_data_unref (_data1_); diff --git a/tests/objects/bug631267.c-expected b/tests/objects/bug631267.c-expected index 2b8a186f0..6fade2d3e 100644 --- a/tests/objects/bug631267.c-expected +++ b/tests/objects/bug631267.c-expected @@ -147,30 +147,30 @@ static void _vala_foo_set_property (GObject * object, const GValue * value, GParamSpec * pspec); static void _vala_main (void); -static void __lambda4_ (void); -static void ___lambda4__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); -static void __lambda5_ (void); -static void ___lambda5__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); -static void __lambda6_ (void); -static void ___lambda6__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); -static void __lambda7_ (void); -static void ___lambda7__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); -static void __lambda8_ (void); -static void ___lambda8__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); -static void __lambda9_ (void); -static void ___lambda9__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); +static void _vala_lambda0_ (void); +static void __vala_lambda0__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); +static void _vala_lambda1_ (void); +static void __vala_lambda1__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); +static void _vala_lambda2_ (void); +static void __vala_lambda2__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); +static void _vala_lambda3_ (void); +static void __vala_lambda3__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); +static void _vala_lambda4_ (void); +static void __vala_lambda4__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); +static void _vala_lambda5_ (void); +static void __vala_lambda5__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -632,87 +632,87 @@ _vala_foo_set_property (GObject * object, } static void -__lambda4_ (void) +_vala_lambda0_ (void) { g_error ("objects_bug631267.vala:39: string-type equality failed"); } static void -___lambda4__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda0__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda4_ (); + _vala_lambda0_ (); } static void -__lambda5_ (void) +_vala_lambda1_ (void) { g_error ("objects_bug631267.vala:40: array-type equality failed"); } static void -___lambda5__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda1__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda5_ (); + _vala_lambda1_ (); } static void -__lambda6_ (void) +_vala_lambda2_ (void) { g_error ("objects_bug631267.vala:41: simple-type equality failed"); } static void -___lambda6__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda2__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda6_ (); + _vala_lambda2_ (); } static void -__lambda7_ (void) +_vala_lambda3_ (void) { g_error ("objects_bug631267.vala:42: object-type equality failed"); } static void -___lambda7__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda3__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda7_ (); + _vala_lambda3_ (); } static void -__lambda8_ (void) +_vala_lambda4_ (void) { g_error ("objects_bug631267.vala:43: struct-type equality failed"); } static void -___lambda8__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda4__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda8_ (); + _vala_lambda4_ (); } static void -__lambda9_ (void) +_vala_lambda5_ (void) { g_error ("objects_bug631267.vala:44: pointer-type equality failed"); } static void -___lambda9__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda5__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda9_ (); + _vala_lambda5_ (); } static void @@ -760,12 +760,12 @@ _vala_main (void) _tmp7_ = t; foo_set_t (foo, &_tmp7_); foo_set_p (foo, p); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::s", (GCallback) ___lambda4__g_object_notify, NULL); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::a", (GCallback) ___lambda5__g_object_notify, NULL); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::i", (GCallback) ___lambda6__g_object_notify, NULL); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::o", (GCallback) ___lambda7__g_object_notify, NULL); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::t", (GCallback) ___lambda8__g_object_notify, NULL); - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::p", (GCallback) ___lambda9__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::s", (GCallback) __vala_lambda0__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::a", (GCallback) __vala_lambda1__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::i", (GCallback) __vala_lambda2__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::o", (GCallback) __vala_lambda3__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::t", (GCallback) __vala_lambda4__g_object_notify, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject), "notify::p", (GCallback) __vala_lambda5__g_object_notify, NULL); foo_set_s (foo, s); foo_set_a (foo, a, a_length1); foo_set_i (foo, i); diff --git a/tests/objects/bug641828.c-expected b/tests/objects/bug641828.c-expected index 999d21efb..bbfb17e81 100644 --- a/tests/objects/bug641828.c-expected +++ b/tests/objects/bug641828.c-expected @@ -79,10 +79,10 @@ VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static GType foo_get_type_once (void); static void _vala_main (void); -static gint __lambda4_ (gint i); -static gint ___lambda4__bar_bar (Bar* _sender, - gint i, - gpointer self); +static gint _vala_lambda0_ (gint i); +static gint __vala_lambda0__bar_bar (Bar* _sender, + gint i, + gpointer self); static void g_cclosure_user_marshal_INT__INT (GClosure * closure, @@ -200,7 +200,7 @@ foo_get_type (void) } static gint -__lambda4_ (gint i) +_vala_lambda0_ (gint i) { gint result; result = i + 12; @@ -208,12 +208,12 @@ __lambda4_ (gint i) } static gint -___lambda4__bar_bar (Bar* _sender, - gint i, - gpointer self) +__vala_lambda0__bar_bar (Bar* _sender, + gint i, + gpointer self) { gint result; - result = __lambda4_ (i); + result = _vala_lambda0_ (i); return result; } @@ -226,7 +226,7 @@ _vala_main (void) gint _tmp1_ = 0; _tmp0_ = foo_new (); f = _tmp0_; - g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (f, TYPE_BAR, Bar), "bar", (GCallback) ___lambda4__bar_bar, NULL); + g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (f, TYPE_BAR, Bar), "bar", (GCallback) __vala_lambda0__bar_bar, NULL); g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (f, TYPE_BAR, Bar), bar_signals[BAR_BAR_SIGNAL], 0, 30, &_tmp1_); res = _tmp1_; _vala_assert (res == 42, "res == 42"); diff --git a/tests/objects/bug646362.c-expected b/tests/objects/bug646362.c-expected index 092d33f38..75cbbf8b8 100644 --- a/tests/objects/bug646362.c-expected +++ b/tests/objects/bug646362.c-expected @@ -57,8 +57,8 @@ VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean _foo___lambda4_ (Block1Data* _data1_); -static gboolean __foo___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static void foo_finalize (GObject * obj); @@ -91,7 +91,7 @@ block1_data_unref (void * _userdata_) } static gboolean -_foo___lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; gboolean result; @@ -101,10 +101,10 @@ _foo___lambda4_ (Block1Data* _data1_) } static gboolean -__foo___lambda4__gsource_func (gpointer self) +__vala_lambda0__gsource_func (gpointer self) { gboolean result; - result = _foo___lambda4_ (self); + result = _vala_lambda0_ (self); return result; } @@ -151,7 +151,7 @@ foo_finalize (GObject * obj) _data1_->_ref_count_ = 1; _data1_->self = self; _data1_->baz = self->priv->bar; - f = __foo___lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; (f_target_destroy_notify == NULL) ? NULL : (f_target_destroy_notify (f_target), NULL); diff --git a/tests/objects/bug663134.c-expected b/tests/objects/bug663134.c-expected index 3b1064b6f..9d17f41e6 100644 --- a/tests/objects/bug663134.c-expected +++ b/tests/objects/bug663134.c-expected @@ -78,10 +78,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, foo_unref) VALA_EXTERN void foo_bar (Foo* self); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean __lambda5_ (Block1Data* _data1_); -static gboolean ___lambda5__gsource_func (gpointer self); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean _vala_lambda1_ (Block1Data* _data1_); +static gboolean __vala_lambda1__gsource_func (gpointer self); +static gboolean __vala_lambda0__gsource_func (gpointer self); VALA_EXTERN Foo* foo_new (GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func); @@ -121,7 +121,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { Foo* self; gboolean result; @@ -133,15 +133,15 @@ __lambda5_ (Block1Data* _data1_) } static gboolean -___lambda5__gsource_func (gpointer self) +__vala_lambda1__gsource_func (gpointer self) { gboolean result; - result = __lambda5_ (self); + result = _vala_lambda1_ (self); return result; } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; GSourceFunc ff = NULL; @@ -151,7 +151,7 @@ __lambda4_ (Block1Data* _data1_) self = _data1_->self; ((_data1_->baz == NULL) || (self->priv->t_destroy_func == NULL)) ? NULL : (_data1_->baz = (self->priv->t_destroy_func (_data1_->baz), NULL)); _data1_->baz = NULL; - ff = ___lambda5__gsource_func; + ff = __vala_lambda1__gsource_func; ff_target = block1_data_ref (_data1_); ff_target_destroy_notify = block1_data_unref; ff (ff_target); @@ -164,10 +164,10 @@ __lambda4_ (Block1Data* _data1_) } static gboolean -___lambda4__gsource_func (gpointer self) +__vala_lambda0__gsource_func (gpointer self) { gboolean result; - result = __lambda4_ (self); + result = _vala_lambda0_ (self); return result; } @@ -183,7 +183,7 @@ foo_bar (Foo* self) _data1_->_ref_count_ = 1; _data1_->self = foo_ref (self); _data1_->baz = NULL; - f = ___lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; f (f_target); diff --git a/tests/objects/bug681356.c-expected b/tests/objects/bug681356.c-expected index ccb27ea62..eaa36ffc5 100644 --- a/tests/objects/bug681356.c-expected +++ b/tests/objects/bug681356.c-expected @@ -65,10 +65,10 @@ static void g_cclosure_user_marshal_INT__INT (GClosure * closure, gpointer marshal_data); static GType foo_get_type_once (void); static void _vala_main (void); -static gint __lambda4_ (gint i); -static gint ___lambda4__foo_bar (Foo* _sender, - gint i, - gpointer self); +static gint _vala_lambda0_ (gint i); +static gint __vala_lambda0__foo_bar (Foo* _sender, + gint i, + gpointer self); Foo* foo_construct (GType object_type) @@ -161,7 +161,7 @@ foo_get_type (void) } static gint -__lambda4_ (gint i) +_vala_lambda0_ (gint i) { gint result; result = i + 12; @@ -169,12 +169,12 @@ __lambda4_ (gint i) } static gint -___lambda4__foo_bar (Foo* _sender, - gint i, - gpointer self) +__vala_lambda0__foo_bar (Foo* _sender, + gint i, + gpointer self) { gint result; - result = __lambda4_ (i); + result = _vala_lambda0_ (i); return result; } @@ -187,7 +187,7 @@ _vala_main (void) gint _tmp1_ = 0; _tmp0_ = foo_new (); f = _tmp0_; - g_signal_connect (f, "bar", (GCallback) ___lambda4__foo_bar, NULL); + g_signal_connect (f, "bar", (GCallback) __vala_lambda0__foo_bar, NULL); g_signal_emit (f, foo_signals[FOO_BAR_SIGNAL], 0, 30, &_tmp1_); res = _tmp1_; _vala_assert (res == 42, "res == 42"); diff --git a/tests/objects/bug683646.c-expected b/tests/objects/bug683646.c-expected index 29dee3f92..ade381489 100644 --- a/tests/objects/bug683646.c-expected +++ b/tests/objects/bug683646.c-expected @@ -28,8 +28,8 @@ VALA_EXTERN void foo (GObject* a, GObject* b); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__func (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__func (gpointer self); static void _vala_main (void); static gpointer @@ -58,7 +58,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { GObject* c = NULL; GObject* _tmp0_; @@ -73,9 +73,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } void @@ -102,7 +102,7 @@ foo (GObject* a, _tmp2_ = _g_object_ref0 (_data1_->a); _g_object_unref0 (_data1_->b); _data1_->b = _tmp2_; - sub = ___lambda4__func; + sub = __vala_lambda0__func; sub_target = block1_data_ref (_data1_); sub_target_destroy_notify = block1_data_unref; (sub_target_destroy_notify == NULL) ? NULL : (sub_target_destroy_notify (sub_target), NULL); diff --git a/tests/objects/interface-abstract-async-override.c-expected b/tests/objects/interface-abstract-async-override.c-expected index 874a09f7c..c3b048442 100644 --- a/tests/objects/interface-abstract-async-override.c-expected +++ b/tests/objects/interface-abstract-async-override.c-expected @@ -94,11 +94,11 @@ VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); static GType bar_get_type_once (void); static void _vala_main (void); -static void __lambda4_ (GObject* o, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (GObject* o, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); void ifoo_foo (IFoo* self, @@ -276,8 +276,8 @@ bar_get_type (void) } static void -__lambda4_ (GObject* o, - GAsyncResult* r) +_vala_lambda0_ (GObject* o, + GAsyncResult* r) { GMainLoop* _tmp0_; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -288,11 +288,11 @@ __lambda4_ (GObject* o, } static void -___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda4_ (source_object, res); + _vala_lambda0_ (source_object, res); } static void @@ -307,7 +307,7 @@ _vala_main (void) loop = _tmp0_; _tmp1_ = bar_new (); bar = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IFOO, IFoo); - ifoo_foo (bar, ___lambda4__gasync_ready_callback, NULL); + ifoo_foo (bar, __vala_lambda0__gasync_ready_callback, NULL); _tmp2_ = loop; g_main_loop_run (_tmp2_); _g_object_unref0 (bar); diff --git a/tests/objects/interface-virtual-override.c-expected b/tests/objects/interface-virtual-override.c-expected index fb9665f45..b49be2c6f 100644 --- a/tests/objects/interface-virtual-override.c-expected +++ b/tests/objects/interface-virtual-override.c-expected @@ -113,11 +113,11 @@ VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); static GType bar_get_type_once (void); static void _vala_main (void); -static void __lambda4_ (GObject* o, - GAsyncResult* a); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (GObject* o, + GAsyncResult* a); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static gint ifoo_real_foo (IFoo* self) @@ -375,8 +375,8 @@ bar_get_type (void) } static void -__lambda4_ (GObject* o, - GAsyncResult* a) +_vala_lambda0_ (GObject* o, + GAsyncResult* a) { GMainLoop* _tmp0_; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -387,11 +387,11 @@ __lambda4_ (GObject* o, } static void -___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda4_ (source_object, res); + _vala_lambda0_ (source_object, res); } static void @@ -407,7 +407,7 @@ _vala_main (void) _tmp1_ = g_main_loop_new (NULL, FALSE); _g_main_loop_unref0 (loop); loop = _tmp1_; - ifoo_bar (G_TYPE_CHECK_INSTANCE_CAST (bar, TYPE_IFOO, IFoo), ___lambda4__gasync_ready_callback, NULL); + ifoo_bar (G_TYPE_CHECK_INSTANCE_CAST (bar, TYPE_IFOO, IFoo), __vala_lambda0__gasync_ready_callback, NULL); _tmp2_ = loop; g_main_loop_run (_tmp2_); _g_object_unref0 (bar); diff --git a/tests/objects/properties.c-expected b/tests/objects/properties.c-expected index 643aa51b3..445ec1b7e 100644 --- a/tests/objects/properties.c-expected +++ b/tests/objects/properties.c-expected @@ -366,12 +366,12 @@ VALA_EXTERN Sample* sample_construct (GType object_type, VALA_EXTERN void sample_set_name (Sample* self, const gchar* value); VALA_EXTERN void sample_run (Sample* self); -static void __lambda4_ (Sample* self, - GObject* s, - GParamSpec* p); -static void ___lambda4__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self); +static void _vala_lambda0_ (Sample* self, + GObject* s, + GParamSpec* p); +static void __vala_lambda0__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self); static void sample_set_automatic (Sample* self, const gchar* value); static const gchar* sample_get_automatic (Sample* self); @@ -721,9 +721,9 @@ sample_new (const gchar* name) } static void -__lambda4_ (Sample* self, - GObject* s, - GParamSpec* p) +_vala_lambda0_ (Sample* self, + GObject* s, + GParamSpec* p) { FILE* _tmp0_; const gchar* _tmp1_; @@ -735,11 +735,11 @@ __lambda4_ (Sample* self, } static void -___lambda4__g_object_notify (GObject* _sender, - GParamSpec* pspec, - gpointer self) +__vala_lambda0__g_object_notify (GObject* _sender, + GParamSpec* pspec, + gpointer self) { - __lambda4_ ((Sample*) self, _sender, pspec); + _vala_lambda0_ ((Sample*) self, _sender, pspec); } void @@ -757,7 +757,7 @@ sample_run (Sample* self) const gchar* _tmp9_; GError* _inner_error0_ = NULL; g_return_if_fail (IS_SAMPLE (self)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify", (GCallback) ___lambda4__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify", (GCallback) __vala_lambda0__g_object_notify, self, 0); sample_set_automatic (self, "TheNewAutomatic"); sample_set_name (self, "TheNewName"); _tmp0_ = stdout; diff --git a/tests/objects/property-delegate-owned.c-expected b/tests/objects/property-delegate-owned.c-expected index df1c1fa37..073bd244e 100644 --- a/tests/objects/property-delegate-owned.c-expected +++ b/tests/objects/property-delegate-owned.c-expected @@ -151,20 +151,20 @@ VALA_EXTERN void foo_set_bar (Foo* self, GDestroyNotify value_target_destroy_notify); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); -static void __lambda4_ (Foo* self); -static void ___lambda4__foo_func (gpointer self); -static void __lambda5_ (Foo* self); -static void ___lambda5__foo_func (gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__foo_func (gpointer self); +static void _vala_lambda1_ (Foo* self); +static void __vala_lambda1__foo_func (gpointer self); static void foo_finalize (Foo * obj); static GType foo_get_type_once (void); VALA_EXTERN GType bar_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Bar, foo_unref) VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); -static void __lambda6_ (Bar* self); -static void ___lambda6__foo_func (gpointer self); -static void __lambda7_ (Bar* self); -static void ___lambda7__foo_func (gpointer self); +static void _vala_lambda2_ (Bar* self); +static void __vala_lambda2__foo_func (gpointer self); +static void _vala_lambda3_ (Bar* self); +static void __vala_lambda3__foo_func (gpointer self); static void bar_finalize (Foo * obj); static GType bar_get_type_once (void); static void _vala_main (void); @@ -257,25 +257,25 @@ foo_get_instance_private (Foo* self) } static void -__lambda4_ (Foo* self) +_vala_lambda0_ (Foo* self) { } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ ((Foo*) self); + _vala_lambda0_ ((Foo*) self); } static void -__lambda5_ (Foo* self) +_vala_lambda1_ (Foo* self) { } static void -___lambda5__foo_func (gpointer self) +__vala_lambda1__foo_func (gpointer self) { - __lambda5_ ((Foo*) self); + _vala_lambda1_ ((Foo*) self); } Foo* @@ -283,8 +283,8 @@ foo_construct (GType object_type) { Foo* self = NULL; self = (Foo*) g_type_create_instance (object_type); - foo_set_foo (self, ___lambda4__foo_func, foo_ref (self), foo_unref); - foo_set_bar (self, ___lambda5__foo_func, foo_ref (self), foo_unref); + foo_set_foo (self, __vala_lambda0__foo_func, foo_ref (self), foo_unref); + foo_set_bar (self, __vala_lambda1__foo_func, foo_ref (self), foo_unref); return self; } @@ -682,25 +682,25 @@ bar_get_instance_private (Bar* self) } static void -__lambda6_ (Bar* self) +_vala_lambda2_ (Bar* self) { } static void -___lambda6__foo_func (gpointer self) +__vala_lambda2__foo_func (gpointer self) { - __lambda6_ ((Bar*) self); + _vala_lambda2_ ((Bar*) self); } static void -__lambda7_ (Bar* self) +_vala_lambda3_ (Bar* self) { } static void -___lambda7__foo_func (gpointer self) +__vala_lambda3__foo_func (gpointer self) { - __lambda7_ ((Bar*) self); + _vala_lambda3_ ((Bar*) self); } Bar* @@ -708,8 +708,8 @@ bar_construct (GType object_type) { Bar* self = NULL; self = (Bar*) foo_construct (object_type); - foo_set_foo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), ___lambda6__foo_func, foo_ref (self), foo_unref); - foo_set_bar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), ___lambda7__foo_func, foo_ref (self), foo_unref); + foo_set_foo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), __vala_lambda2__foo_func, foo_ref (self), foo_unref); + foo_set_bar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), __vala_lambda3__foo_func, foo_ref (self), foo_unref); return self; } diff --git a/tests/objects/regex.c-expected b/tests/objects/regex.c-expected index e8a1fc5e2..6952abb78 100644 --- a/tests/objects/regex.c-expected +++ b/tests/objects/regex.c-expected @@ -77,11 +77,11 @@ static GType test_get_type_once (void); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - const gchar* s); -static void ___lambda4__test_regex_test (Test* _sender, - const gchar* str, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + const gchar* s); +static void __vala_lambda0__test_regex_test (Test* _sender, + const gchar* str, + gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -244,8 +244,8 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - const gchar* s) +_vala_lambda0_ (Block1Data* _data1_, + const gchar* s) { GMatchInfo* _tmp0_ = NULL; gboolean _tmp1_; @@ -293,11 +293,11 @@ __lambda4_ (Block1Data* _data1_, } static void -___lambda4__test_regex_test (Test* _sender, - const gchar* str, - gpointer self) +__vala_lambda0__test_regex_test (Test* _sender, + const gchar* str, + gpointer self) { - __lambda4_ (self, str); + _vala_lambda0_ (self, str); } static void @@ -568,7 +568,7 @@ _vala_main (void) _data1_->rc = _tmp70_; _tmp71_ = test_new (); test = _tmp71_; - g_signal_connect_data (test, "regex-test", (GCallback) ___lambda4__test_regex_test, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (test, "regex-test", (GCallback) __vala_lambda0__test_regex_test, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); test_run (test, "fooBar"); test_run (test, "foobAr"); _g_object_unref0 (test); diff --git a/tests/objects/signals-delegate-parameter.c-expected b/tests/objects/signals-delegate-parameter.c-expected index b1b98f686..a9128b5f2 100644 --- a/tests/objects/signals-delegate-parameter.c-expected +++ b/tests/objects/signals-delegate-parameter.c-expected @@ -122,23 +122,23 @@ VALA_EXTERN void bar_test_no_target (Bar* self); static void _no_target_cb_foo_delegate_param_no_target (Foo* _sender, BarFunc f, gpointer self); -static void __lambda4_ (void); -static void ___lambda4__bar_func (void); +static void _vala_lambda0_ (void); +static void __vala_lambda0__bar_func (void); VALA_EXTERN void bar_test_with_target (Bar* self); static void _with_target_cb_foo_delegate_param_with_target (Foo* _sender, FooFunc f, gpointer f_target, gpointer self); -static void __lambda5_ (Bar* self); -static void ___lambda5__foo_func (gpointer self); +static void _vala_lambda1_ (Bar* self); +static void __vala_lambda1__foo_func (gpointer self); VALA_EXTERN void bar_test_with_destroy (Bar* self); static void _with_destroy_cb_foo_delegate_param_with_destroy (Foo* _sender, FooFunc f, gpointer f_target, GDestroyNotify f_target_destroy_notify, gpointer self); -static void __lambda6_ (Bar* self); -static void ___lambda6__foo_func (gpointer self); +static void _vala_lambda2_ (Bar* self); +static void __vala_lambda2__foo_func (gpointer self); static void bar_finalize (GObject * obj); static GType bar_get_type_once (void); static void _vala_main (void); @@ -304,15 +304,15 @@ _no_target_cb_foo_delegate_param_no_target (Foo* _sender, } static void -__lambda4_ (void) +_vala_lambda0_ (void) { success1 = TRUE; } static void -___lambda4__bar_func (void) +__vala_lambda0__bar_func (void) { - __lambda4_ (); + _vala_lambda0_ (); } void @@ -324,7 +324,7 @@ bar_test_no_target (Bar* self) _tmp0_ = self->priv->foo; g_signal_connect (_tmp0_, "delegate-param-no-target", (GCallback) _no_target_cb_foo_delegate_param_no_target, NULL); _tmp1_ = self->priv->foo; - g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_NO_TARGET_SIGNAL], 0, ___lambda4__bar_func); + g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_NO_TARGET_SIGNAL], 0, __vala_lambda0__bar_func); _vala_assert (success1, "success1"); } @@ -338,16 +338,16 @@ _with_target_cb_foo_delegate_param_with_target (Foo* _sender, } static void -__lambda5_ (Bar* self) +_vala_lambda1_ (Bar* self) { _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "this.ref_count == 1"); self->priv->success2 = TRUE; } static void -___lambda5__foo_func (gpointer self) +__vala_lambda1__foo_func (gpointer self) { - __lambda5_ ((Bar*) self); + _vala_lambda1_ ((Bar*) self); } void @@ -359,7 +359,7 @@ bar_test_with_target (Bar* self) _tmp0_ = self->priv->foo; g_signal_connect (_tmp0_, "delegate-param-with-target", (GCallback) _with_target_cb_foo_delegate_param_with_target, NULL); _tmp1_ = self->priv->foo; - g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_WITH_TARGET_SIGNAL], 0, ___lambda5__foo_func, self); + g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_WITH_TARGET_SIGNAL], 0, __vala_lambda1__foo_func, self); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "this.ref_count == 1"); _vala_assert (self->priv->success2, "success2"); } @@ -375,16 +375,16 @@ _with_destroy_cb_foo_delegate_param_with_destroy (Foo* _sender, } static void -__lambda6_ (Bar* self) +_vala_lambda2_ (Bar* self) { _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); self->priv->success3 = TRUE; } static void -___lambda6__foo_func (gpointer self) +__vala_lambda2__foo_func (gpointer self) { - __lambda6_ ((Bar*) self); + _vala_lambda2_ ((Bar*) self); } void @@ -396,7 +396,7 @@ bar_test_with_destroy (Bar* self) _tmp0_ = self->priv->foo; g_signal_connect (_tmp0_, "delegate-param-with-destroy", (GCallback) _with_destroy_cb_foo_delegate_param_with_destroy, NULL); _tmp1_ = self->priv->foo; - g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_WITH_DESTROY_SIGNAL], 0, ___lambda6__foo_func, g_object_ref (self), g_object_unref); + g_signal_emit (_tmp1_, foo_signals[FOO_DELEGATE_PARAM_WITH_DESTROY_SIGNAL], 0, __vala_lambda2__foo_func, g_object_ref (self), g_object_unref); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "this.ref_count == 1"); _vala_assert (self->priv->success3, "success3"); } diff --git a/tests/objects/signals-enum-marshal.c-expected b/tests/objects/signals-enum-marshal.c-expected index f9a234bdb..7655f0fe6 100644 --- a/tests/objects/signals-enum-marshal.c-expected +++ b/tests/objects/signals-enum-marshal.c-expected @@ -81,16 +81,16 @@ static void g_cclosure_user_marshal_VOID__FLAGS_STRING (GClosure * closure, gpointer marshal_data); static GType manam_get_type_once (void); static void _vala_main (void); -static void __lambda4_ (void); -static void ___lambda4__manam_foo (Manam* _sender, - Foo f, - const gchar* s, - gpointer self); -static void __lambda5_ (void); -static void ___lambda5__manam_bar (Manam* _sender, - Bar b, - const gchar* s, - gpointer self); +static void _vala_lambda0_ (void); +static void __vala_lambda0__manam_foo (Manam* _sender, + Foo f, + const gchar* s, + gpointer self); +static void _vala_lambda1_ (void); +static void __vala_lambda1__manam_bar (Manam* _sender, + Bar b, + const gchar* s, + gpointer self); static GType foo_get_type_once (void) @@ -237,31 +237,31 @@ manam_get_type (void) } static void -__lambda4_ (void) +_vala_lambda0_ (void) { } static void -___lambda4__manam_foo (Manam* _sender, - Foo f, - const gchar* s, - gpointer self) +__vala_lambda0__manam_foo (Manam* _sender, + Foo f, + const gchar* s, + gpointer self) { - __lambda4_ (); + _vala_lambda0_ (); } static void -__lambda5_ (void) +_vala_lambda1_ (void) { } static void -___lambda5__manam_bar (Manam* _sender, - Bar b, - const gchar* s, - gpointer self) +__vala_lambda1__manam_bar (Manam* _sender, + Bar b, + const gchar* s, + gpointer self) { - __lambda5_ (); + _vala_lambda1_ (); } static void @@ -271,9 +271,9 @@ _vala_main (void) Manam* _tmp0_; _tmp0_ = manam_new (); manam = _tmp0_; - g_signal_connect (manam, "foo", (GCallback) ___lambda4__manam_foo, NULL); + g_signal_connect (manam, "foo", (GCallback) __vala_lambda0__manam_foo, NULL); g_signal_emit (manam, manam_signals[MANAM_FOO_SIGNAL], 0, FOO_FOO, "foo"); - g_signal_connect (manam, "bar", (GCallback) ___lambda5__manam_bar, NULL); + g_signal_connect (manam, "bar", (GCallback) __vala_lambda1__manam_bar, NULL); g_signal_emit (manam, manam_signals[MANAM_BAR_SIGNAL], 0, BAR_BAR, "bar"); _g_object_unref0 (manam); } diff --git a/tests/objects/signals-fundamental-return.c-expected b/tests/objects/signals-fundamental-return.c-expected index 4c126b587..215b3b6b2 100644 --- a/tests/objects/signals-fundamental-return.c-expected +++ b/tests/objects/signals-fundamental-return.c-expected @@ -175,12 +175,12 @@ static void g_cclosure_user_marshal_MAMAN__VOID (GClosure * closure, static void foo_finalize (Foo * obj); static GType foo_get_type_once (void); static void _vala_main (void); -static Foo* __lambda4_ (void); -static Foo* ___lambda4__foo_on_foo (Foo* _sender, - gpointer self); -static IBar* __lambda5_ (void); -static IBar* ___lambda5__foo_on_bar (Foo* _sender, - gpointer self); +static Foo* _vala_lambda0_ (void); +static Foo* __vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self); +static IBar* _vala_lambda1_ (void); +static IBar* __vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self); Maman* maman_construct (GType object_type) @@ -754,7 +754,7 @@ foo_unref (gpointer instance) } static Foo* -__lambda4_ (void) +_vala_lambda0_ (void) { Foo* _tmp0_; Foo* result; @@ -764,16 +764,16 @@ __lambda4_ (void) } static Foo* -___lambda4__foo_on_foo (Foo* _sender, - gpointer self) +__vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self) { Foo* result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } static IBar* -__lambda5_ (void) +_vala_lambda1_ (void) { Bar* _tmp0_; IBar* result; @@ -783,11 +783,11 @@ __lambda5_ (void) } static IBar* -___lambda5__foo_on_bar (Foo* _sender, - gpointer self) +__vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self) { IBar* result; - result = __lambda5_ (); + result = _vala_lambda1_ (); return result; } @@ -802,8 +802,8 @@ _vala_main (void) IBar* _tmp2_ = NULL; _tmp0_ = foo_new (); foo = _tmp0_; - g_signal_connect (foo, "on-foo", (GCallback) ___lambda4__foo_on_foo, NULL); - g_signal_connect (foo, "on-bar", (GCallback) ___lambda5__foo_on_bar, NULL); + g_signal_connect (foo, "on-foo", (GCallback) __vala_lambda0__foo_on_foo, NULL); + g_signal_connect (foo, "on-bar", (GCallback) __vala_lambda1__foo_on_bar, NULL); g_signal_emit (foo, foo_signals[FOO_ON_FOO_SIGNAL], 0, &_tmp1_); bar = _tmp1_; _vala_assert (IS_FOO (bar), "bar is Foo"); diff --git a/tests/objects/signals-generic-return.c-expected b/tests/objects/signals-generic-return.c-expected index ba6bfc709..8c85064b3 100644 --- a/tests/objects/signals-generic-return.c-expected +++ b/tests/objects/signals-generic-return.c-expected @@ -104,12 +104,12 @@ static void _vala_foo_set_property (GObject * object, VALA_EXTERN gint cb_foo (void); VALA_EXTERN gchar* cb_bar (void); static void _vala_main (void); -static gint ___lambda4_ (void); -static gpointer ____lambda4__foo_on_foo (Foo* _sender, - gpointer self); -static gchar* ___lambda5_ (void); -static gpointer ____lambda5__foo_on_bar (Foo* _sender, - gpointer self); +static gint _vala_lambda0_ (void); +static gpointer __vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self); +static gchar* _vala_lambda1_ (void); +static gpointer __vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self); static gpointer _cb_foo_foo_on_foo (Foo* _sender, gpointer self); static gpointer _cb_bar_foo_on_bar (Foo* _sender, @@ -313,7 +313,7 @@ cb_bar (void) } static gint -___lambda4_ (void) +_vala_lambda0_ (void) { gint result; result = 42; @@ -321,16 +321,16 @@ ___lambda4_ (void) } static gpointer -____lambda4__foo_on_foo (Foo* _sender, - gpointer self) +__vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self) { gpointer result; - result = (gpointer) ((gintptr) ___lambda4_ ()); + result = (gpointer) ((gintptr) _vala_lambda0_ ()); return result; } static gchar* -___lambda5_ (void) +_vala_lambda1_ (void) { gchar* _tmp0_; gchar* result; @@ -340,11 +340,11 @@ ___lambda5_ (void) } static gpointer -____lambda5__foo_on_bar (Foo* _sender, - gpointer self) +__vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self) { gpointer result; - result = ___lambda5_ (); + result = _vala_lambda1_ (); return result; } @@ -378,8 +378,8 @@ _vala_main (void) gpointer _tmp2_ = NULL; _tmp0_ = foo_new (G_TYPE_INT, NULL, NULL, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free); foo = _tmp0_; - g_signal_connect (foo, "on-foo", (GCallback) ____lambda4__foo_on_foo, NULL); - g_signal_connect (foo, "on-bar", (GCallback) ____lambda5__foo_on_bar, NULL); + g_signal_connect (foo, "on-foo", (GCallback) __vala_lambda0__foo_on_foo, NULL); + g_signal_connect (foo, "on-bar", (GCallback) __vala_lambda1__foo_on_bar, NULL); g_signal_emit (foo, foo_signals[FOO_ON_FOO_SIGNAL], 0, &_tmp1_); bar = (gint) ((gintptr) _tmp1_); _vala_assert (bar == 42, "bar == 42"); diff --git a/tests/objects/signals-gobject-return.c-expected b/tests/objects/signals-gobject-return.c-expected index e3337caa6..30c59942d 100644 --- a/tests/objects/signals-gobject-return.c-expected +++ b/tests/objects/signals-gobject-return.c-expected @@ -80,12 +80,12 @@ static void g_cclosure_user_marshal_OBJECT__VOID (GClosure * closure, gpointer marshal_data); static GType foo_get_type_once (void); static void _vala_main (void); -static Foo* __lambda4_ (void); -static Foo* ___lambda4__foo_on_foo (Foo* _sender, - gpointer self); -static IBar* __lambda5_ (void); -static IBar* ___lambda5__foo_on_bar (Foo* _sender, - gpointer self); +static Foo* _vala_lambda0_ (void); +static Foo* __vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self); +static IBar* _vala_lambda1_ (void); +static IBar* __vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self); static void ibar_default_init (IBarIface * iface, @@ -204,7 +204,7 @@ foo_get_type (void) } static Foo* -__lambda4_ (void) +_vala_lambda0_ (void) { Foo* _tmp0_; Foo* result; @@ -214,16 +214,16 @@ __lambda4_ (void) } static Foo* -___lambda4__foo_on_foo (Foo* _sender, - gpointer self) +__vala_lambda0__foo_on_foo (Foo* _sender, + gpointer self) { Foo* result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } static IBar* -__lambda5_ (void) +_vala_lambda1_ (void) { Foo* _tmp0_; IBar* result; @@ -233,11 +233,11 @@ __lambda5_ (void) } static IBar* -___lambda5__foo_on_bar (Foo* _sender, - gpointer self) +__vala_lambda1__foo_on_bar (Foo* _sender, + gpointer self) { IBar* result; - result = __lambda5_ (); + result = _vala_lambda1_ (); return result; } @@ -252,8 +252,8 @@ _vala_main (void) IBar* _tmp2_ = NULL; _tmp0_ = foo_new (); foo = _tmp0_; - g_signal_connect (foo, "on-foo", (GCallback) ___lambda4__foo_on_foo, NULL); - g_signal_connect (foo, "on-bar", (GCallback) ___lambda5__foo_on_bar, NULL); + g_signal_connect (foo, "on-foo", (GCallback) __vala_lambda0__foo_on_foo, NULL); + g_signal_connect (foo, "on-bar", (GCallback) __vala_lambda1__foo_on_bar, NULL); g_signal_emit (foo, foo_signals[FOO_ON_FOO_SIGNAL], 0, &_tmp1_); bar = _tmp1_; _vala_assert (IS_FOO (bar), "bar is Foo"); diff --git a/tests/objects/signals-lambda-delegate.c-expected b/tests/objects/signals-lambda-delegate.c-expected index 665221b98..5fabdf8b2 100644 --- a/tests/objects/signals-lambda-delegate.c-expected +++ b/tests/objects/signals-lambda-delegate.c-expected @@ -70,12 +70,12 @@ static GType foo_get_type_once (void); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void ___lambda4_ (Block1Data* _data1_, - Foo* f, - const gchar* s); -static void ____lambda4__foo_func (Foo* foo, - const gchar* s, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + Foo* f, + const gchar* s); +static void __vala_lambda0__foo_func (Foo* foo, + const gchar* s, + gpointer self); Foo* foo_construct (GType object_type) @@ -145,9 +145,9 @@ block1_data_unref (void * _userdata_) } static void -___lambda4_ (Block1Data* _data1_, - Foo* f, - const gchar* s) +_vala_lambda0_ (Block1Data* _data1_, + Foo* f, + const gchar* s) { gboolean _tmp0_ = FALSE; g_return_if_fail (IS_FOO (f)); @@ -171,11 +171,11 @@ ___lambda4_ (Block1Data* _data1_, } static void -____lambda4__foo_func (Foo* foo, - const gchar* s, - gpointer self) +__vala_lambda0__foo_func (Foo* foo, + const gchar* s, + gpointer self) { - ___lambda4_ (self, foo, s); + _vala_lambda0_ (self, foo, s); } static void @@ -196,12 +196,12 @@ _vala_main (void) GDestroyNotify callback_target_destroy_notify; gulong _tmp1_; gulong _tmp2_; - callback = ____lambda4__foo_func; + callback = __vala_lambda0__foo_func; callback_target = block1_data_ref (_data1_); callback_target_destroy_notify = block1_data_unref; - _tmp1_ = g_signal_connect_data (foo, "bar", (GCallback) ____lambda4__foo_func, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp1_ = g_signal_connect_data (foo, "bar", (GCallback) __vala_lambda0__foo_func, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _data1_->bar_id = _tmp1_; - _tmp2_ = g_signal_connect_data (foo, "baz", (GCallback) ____lambda4__foo_func, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp2_ = g_signal_connect_data (foo, "baz", (GCallback) __vala_lambda0__foo_func, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); _data1_->baz_id = _tmp2_; (callback_target_destroy_notify == NULL) ? NULL : (callback_target_destroy_notify (callback_target), NULL); callback = NULL; diff --git a/tests/objects/signals-struct-return.c-expected b/tests/objects/signals-struct-return.c-expected index 6982aaf15..e145d3d1e 100644 --- a/tests/objects/signals-struct-return.c-expected +++ b/tests/objects/signals-struct-return.c-expected @@ -97,23 +97,23 @@ static void g_cclosure_user_marshal_POINTER__STRING (GClosure * closure, gpointer marshal_data); static GType bar_get_type_once (void); static void _vala_main (void); -static void ___lambda4_ (Foo* result); -static void ____lambda4__bar_on_foo (Bar* _sender, - Foo* result, - gpointer self); -static void ___lambda5_ (const gchar* s, - Foo* result); -static void ____lambda5__bar_on_foo_with_arg (Bar* _sender, - const gchar* s, - Foo* result, - gpointer self); -static Foo* ___lambda6_ (void); -static Foo* ____lambda6__bar_on_bar (Bar* _sender, - gpointer self); -static Foo* ___lambda7_ (const gchar* s); -static Foo* ____lambda7__bar_on_bar_with_arg (Bar* _sender, - const gchar* s, - gpointer self); +static void _vala_lambda0_ (Foo* result); +static void __vala_lambda0__bar_on_foo (Bar* _sender, + Foo* result, + gpointer self); +static void _vala_lambda1_ (const gchar* s, + Foo* result); +static void __vala_lambda1__bar_on_foo_with_arg (Bar* _sender, + const gchar* s, + Foo* result, + gpointer self); +static Foo* _vala_lambda2_ (void); +static Foo* __vala_lambda2__bar_on_bar (Bar* _sender, + gpointer self); +static Foo* _vala_lambda3_ (const gchar* s); +static Foo* __vala_lambda3__bar_on_bar_with_arg (Bar* _sender, + const gchar* s, + gpointer self); void foo_copy (const Foo* self, @@ -307,7 +307,7 @@ bar_get_type (void) } static void -___lambda4_ (Foo* result) +_vala_lambda0_ (Foo* result) { gchar* _tmp0_; Foo _tmp1_ = {0}; @@ -320,16 +320,16 @@ ___lambda4_ (Foo* result) } static void -____lambda4__bar_on_foo (Bar* _sender, - Foo* result, - gpointer self) +__vala_lambda0__bar_on_foo (Bar* _sender, + Foo* result, + gpointer self) { - ___lambda4_ (result); + _vala_lambda0_ (result); } static void -___lambda5_ (const gchar* s, - Foo* result) +_vala_lambda1_ (const gchar* s, + Foo* result) { gchar* _tmp0_; Foo _tmp1_ = {0}; @@ -344,12 +344,12 @@ ___lambda5_ (const gchar* s, } static void -____lambda5__bar_on_foo_with_arg (Bar* _sender, - const gchar* s, - Foo* result, - gpointer self) +__vala_lambda1__bar_on_foo_with_arg (Bar* _sender, + const gchar* s, + Foo* result, + gpointer self) { - ___lambda5_ (s, result); + _vala_lambda1_ (s, result); } static gpointer @@ -359,7 +359,7 @@ _foo_dup0 (gpointer self) } static Foo* -___lambda6_ (void) +_vala_lambda2_ (void) { gchar* _tmp0_; Foo _tmp1_ = {0}; @@ -380,16 +380,16 @@ ___lambda6_ (void) } static Foo* -____lambda6__bar_on_bar (Bar* _sender, - gpointer self) +__vala_lambda2__bar_on_bar (Bar* _sender, + gpointer self) { Foo* result; - result = ___lambda6_ (); + result = _vala_lambda2_ (); return result; } static Foo* -___lambda7_ (const gchar* s) +_vala_lambda3_ (const gchar* s) { gchar* _tmp0_; Foo _tmp1_ = {0}; @@ -412,12 +412,12 @@ ___lambda7_ (const gchar* s) } static Foo* -____lambda7__bar_on_bar_with_arg (Bar* _sender, - const gchar* s, - gpointer self) +__vala_lambda3__bar_on_bar_with_arg (Bar* _sender, + const gchar* s, + gpointer self) { Foo* result; - result = ___lambda7_ (s); + result = _vala_lambda3_ (s); return result; } @@ -439,8 +439,8 @@ _vala_main (void) Foo _tmp8_; _tmp0_ = bar_new (); bar = _tmp0_; - g_signal_connect (bar, "on-foo", (GCallback) ____lambda4__bar_on_foo, NULL); - g_signal_connect (bar, "on-foo-with-arg", (GCallback) ____lambda5__bar_on_foo_with_arg, NULL); + g_signal_connect (bar, "on-foo", (GCallback) __vala_lambda0__bar_on_foo, NULL); + g_signal_connect (bar, "on-foo-with-arg", (GCallback) __vala_lambda1__bar_on_foo_with_arg, NULL); g_signal_emit (bar, bar_signals[BAR_ON_FOO_SIGNAL], 0, &_tmp1_); foo = _tmp1_; _tmp2_ = foo; @@ -470,8 +470,8 @@ _vala_main (void) const gchar* _tmp13_; _tmp9_ = bar_new (); bar = _tmp9_; - g_signal_connect (bar, "on-bar", (GCallback) ____lambda6__bar_on_bar, NULL); - g_signal_connect (bar, "on-bar-with-arg", (GCallback) ____lambda7__bar_on_bar_with_arg, NULL); + g_signal_connect (bar, "on-bar", (GCallback) __vala_lambda2__bar_on_bar, NULL); + g_signal_connect (bar, "on-bar-with-arg", (GCallback) __vala_lambda3__bar_on_bar_with_arg, NULL); g_signal_emit (bar, bar_signals[BAR_ON_BAR_SIGNAL], 0, &_tmp10_); foo = _tmp10_; _tmp11_ = (*foo).s; diff --git a/tests/objects/signals-struct.c-expected b/tests/objects/signals-struct.c-expected index cdc093ff1..cbf682275 100644 --- a/tests/objects/signals-struct.c-expected +++ b/tests/objects/signals-struct.c-expected @@ -99,18 +99,18 @@ VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); static GType bar_get_type_once (void); static void _vala_main (void); -static void __lambda4_ (Foo* f); -static void ___lambda4__bar_on_foo (Bar* _sender, - Foo* foo, - gpointer self); -static void __lambda5_ (Faz* f); -static void ___lambda5__bar_on_faz (Bar* _sender, - Faz* faz, - gpointer self); -static void __lambda6_ (Baz* b); -static void ___lambda6__bar_on_baz (Bar* _sender, - Baz* baz, - gpointer self); +static void _vala_lambda0_ (Foo* f); +static void __vala_lambda0__bar_on_foo (Bar* _sender, + Foo* foo, + gpointer self); +static void _vala_lambda1_ (Faz* f); +static void __vala_lambda1__bar_on_faz (Bar* _sender, + Faz* faz, + gpointer self); +static void _vala_lambda2_ (Baz* b); +static void __vala_lambda2__bar_on_baz (Bar* _sender, + Baz* baz, + gpointer self); void foo_copy (const Foo* self, @@ -309,7 +309,7 @@ bar_get_type (void) } static void -__lambda4_ (Foo* f) +_vala_lambda0_ (Foo* f) { Foo _tmp0_; const gchar* _tmp1_; @@ -323,15 +323,15 @@ __lambda4_ (Foo* f) } static void -___lambda4__bar_on_foo (Bar* _sender, - Foo* foo, - gpointer self) +__vala_lambda0__bar_on_foo (Bar* _sender, + Foo* foo, + gpointer self) { - __lambda4_ (foo); + _vala_lambda0_ (foo); } static void -__lambda5_ (Faz* f) +_vala_lambda1_ (Faz* f) { Faz _tmp0_; const gchar* _tmp1_; @@ -345,15 +345,15 @@ __lambda5_ (Faz* f) } static void -___lambda5__bar_on_faz (Bar* _sender, - Faz* faz, - gpointer self) +__vala_lambda1__bar_on_faz (Bar* _sender, + Faz* faz, + gpointer self) { - __lambda5_ (faz); + _vala_lambda1_ (faz); } static void -__lambda6_ (Baz* b) +_vala_lambda2_ (Baz* b) { Baz _tmp0_; Baz _tmp1_; @@ -367,11 +367,11 @@ __lambda6_ (Baz* b) } static void -___lambda6__bar_on_baz (Bar* _sender, - Baz* baz, - gpointer self) +__vala_lambda2__bar_on_baz (Bar* _sender, + Baz* baz, + gpointer self) { - __lambda6_ (baz); + _vala_lambda2_ (baz); } static void @@ -384,17 +384,17 @@ _vala_main (void) Baz _tmp3_ = {0}; _tmp0_ = bar_new (); bar = _tmp0_; - g_signal_connect (bar, "on-foo", (GCallback) ___lambda4__bar_on_foo, NULL); + g_signal_connect (bar, "on-foo", (GCallback) __vala_lambda0__bar_on_foo, NULL); _g_free0 (_tmp1_.s); _tmp1_.s = "foo"; _tmp1_.i = 23; g_signal_emit (bar, bar_signals[BAR_ON_FOO_SIGNAL], 0, &_tmp1_); - g_signal_connect (bar, "on-faz", (GCallback) ___lambda5__bar_on_faz, NULL); + g_signal_connect (bar, "on-faz", (GCallback) __vala_lambda1__bar_on_faz, NULL); _g_free0 (_tmp2_.s); _tmp2_.s = "faz"; _tmp2_.i = 42; g_signal_emit (bar, bar_signals[BAR_ON_FAZ_SIGNAL], 0, &_tmp2_); - g_signal_connect (bar, "on-baz", (GCallback) ___lambda6__bar_on_baz, NULL); + g_signal_connect (bar, "on-baz", (GCallback) __vala_lambda2__bar_on_baz, NULL); _tmp3_.i = 4711; _g_free0 (_tmp3_.s); _tmp3_.s = "baz"; diff --git a/tests/objects/signals.c-expected b/tests/objects/signals.c-expected index 5e7d36ad6..5cc0f908d 100644 --- a/tests/objects/signals.c-expected +++ b/tests/objects/signals.c-expected @@ -211,12 +211,12 @@ static void maman_bar_activated (MamanBar* self, MamanFoo* foo, gboolean b); VALA_EXTERN void maman_bar_run (MamanBar* self); -static void __lambda4_ (MamanBar* self, - MamanFoo* foo, - gboolean b); -static void ___lambda4__maman_foo_activated (MamanFoo* _sender, - gboolean b, - gpointer self); +static void _vala_lambda0_ (MamanBar* self, + MamanFoo* foo, + gboolean b); +static void __vala_lambda0__maman_foo_activated (MamanFoo* _sender, + gboolean b, + gpointer self); static void _maman_bar_activated_maman_foo_activated (MamanFoo* _sender, gboolean b, gpointer self); @@ -238,16 +238,16 @@ static GType maman_user_foo_get_type_once (void); VALA_EXTERN GType maman_user_bar_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (MamanUserBar, g_object_unref) VALA_EXTERN void maman_user_bar_run (MamanUserBar* self); -static void __lambda5_ (MamanUserBar* self, - MamanUserFoo* foo, - gint i1, - gint i2, - gint* i3); -static void ___lambda5__maman_user_foo_activated (MamanUserFoo* _sender, - gint i1, - gint i2, - gint* i3, - gpointer self); +static void _vala_lambda1_ (MamanUserBar* self, + MamanUserFoo* foo, + gint i1, + gint i2, + gint* i3); +static void __vala_lambda1__maman_user_foo_activated (MamanUserFoo* _sender, + gint i1, + gint i2, + gint* i3, + gpointer self); VALA_EXTERN MamanUserBar* maman_user_bar_new (void); VALA_EXTERN MamanUserBar* maman_user_bar_construct (GType object_type); static GType maman_user_bar_get_type_once (void); @@ -271,18 +271,18 @@ static GType maman_return_foo_get_type_once (void); VALA_EXTERN GType maman_return_bar_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (MamanReturnBar, g_object_unref) VALA_EXTERN void maman_return_bar_run (MamanReturnBar* self); -static gint __lambda6_ (MamanReturnBar* self, - MamanReturnFoo* foo, - gint arg); -static gint ___lambda6__maman_return_foo_int_activated (MamanReturnFoo* _sender, - gint arg, - gpointer self); -static gchar* __lambda7_ (MamanReturnBar* self, - MamanReturnFoo* foo, - const gchar* arg); -static gchar* ___lambda7__maman_return_foo_string_activated (MamanReturnFoo* _sender, - const gchar* arg, - gpointer self); +static gint _vala_lambda2_ (MamanReturnBar* self, + MamanReturnFoo* foo, + gint arg); +static gint __vala_lambda2__maman_return_foo_int_activated (MamanReturnFoo* _sender, + gint arg, + gpointer self); +static gchar* _vala_lambda3_ (MamanReturnBar* self, + MamanReturnFoo* foo, + const gchar* arg); +static gchar* __vala_lambda3__maman_return_foo_string_activated (MamanReturnFoo* _sender, + const gchar* arg, + gpointer self); VALA_EXTERN MamanReturnBar* maman_return_bar_new (void); VALA_EXTERN MamanReturnBar* maman_return_bar_construct (GType object_type); static GType maman_return_bar_get_type_once (void); @@ -366,9 +366,9 @@ maman_bar_activated (MamanBar* self, } static void -__lambda4_ (MamanBar* self, - MamanFoo* foo, - gboolean b) +_vala_lambda0_ (MamanBar* self, + MamanFoo* foo, + gboolean b) { g_return_if_fail (MAMAN_IS_FOO (foo)); if (b) { @@ -391,11 +391,11 @@ __lambda4_ (MamanBar* self, } static void -___lambda4__maman_foo_activated (MamanFoo* _sender, - gboolean b, - gpointer self) +__vala_lambda0__maman_foo_activated (MamanFoo* _sender, + gboolean b, + gpointer self) { - __lambda4_ ((MamanBar*) self, _sender, b); + _vala_lambda0_ ((MamanBar*) self, _sender, b); } static void @@ -430,7 +430,7 @@ maman_bar_run (MamanBar* self) _vala_assert (_tmp1_ == 2, "++counter == 2"); _tmp2_ = maman_foo_new (); foo = _tmp2_; - g_signal_connect_object (foo, "activated", (GCallback) ___lambda4__maman_foo_activated, self, 0); + g_signal_connect_object (foo, "activated", (GCallback) __vala_lambda0__maman_foo_activated, self, 0); g_signal_connect_object (foo, "activated", (GCallback) _maman_bar_activated_maman_foo_activated, self, 0); _tmp3_ = stdout; fprintf (_tmp3_, " 3"); @@ -594,11 +594,11 @@ maman_user_foo_get_type (void) } static void -__lambda5_ (MamanUserBar* self, - MamanUserFoo* foo, - gint i1, - gint i2, - gint* i3) +_vala_lambda1_ (MamanUserBar* self, + MamanUserFoo* foo, + gint i1, + gint i2, + gint* i3) { gint _vala_i3 = 0; FILE* _tmp0_; @@ -616,13 +616,13 @@ __lambda5_ (MamanUserBar* self, } static void -___lambda5__maman_user_foo_activated (MamanUserFoo* _sender, - gint i1, - gint i2, - gint* i3, - gpointer self) +__vala_lambda1__maman_user_foo_activated (MamanUserFoo* _sender, + gint i1, + gint i2, + gint* i3, + gpointer self) { - __lambda5_ ((MamanUserBar*) self, _sender, i1, i2, i3); + _vala_lambda1_ ((MamanUserBar*) self, _sender, i1, i2, i3); } void @@ -644,7 +644,7 @@ maman_user_bar_run (MamanUserBar* self) _vala_assert (_tmp1_ == 2, "++counter == 2"); _tmp2_ = maman_user_foo_new (); foo = _tmp2_; - g_signal_connect_object (foo, "activated", (GCallback) ___lambda5__maman_user_foo_activated, self, 0); + g_signal_connect_object (foo, "activated", (GCallback) __vala_lambda1__maman_user_foo_activated, self, 0); _tmp3_ = stdout; fprintf (_tmp3_, " 3"); counter = counter + 1; @@ -816,9 +816,9 @@ maman_return_foo_get_type (void) } static gint -__lambda6_ (MamanReturnBar* self, - MamanReturnFoo* foo, - gint arg) +_vala_lambda2_ (MamanReturnBar* self, + MamanReturnFoo* foo, + gint arg) { FILE* _tmp0_; gint _tmp1_; @@ -834,19 +834,19 @@ __lambda6_ (MamanReturnBar* self, } static gint -___lambda6__maman_return_foo_int_activated (MamanReturnFoo* _sender, - gint arg, - gpointer self) +__vala_lambda2__maman_return_foo_int_activated (MamanReturnFoo* _sender, + gint arg, + gpointer self) { gint result; - result = __lambda6_ ((MamanReturnBar*) self, _sender, arg); + result = _vala_lambda2_ ((MamanReturnBar*) self, _sender, arg); return result; } static gchar* -__lambda7_ (MamanReturnBar* self, - MamanReturnFoo* foo, - const gchar* arg) +_vala_lambda3_ (MamanReturnBar* self, + MamanReturnFoo* foo, + const gchar* arg) { FILE* _tmp0_; gint _tmp1_; @@ -865,12 +865,12 @@ __lambda7_ (MamanReturnBar* self, } static gchar* -___lambda7__maman_return_foo_string_activated (MamanReturnFoo* _sender, - const gchar* arg, - gpointer self) +__vala_lambda3__maman_return_foo_string_activated (MamanReturnFoo* _sender, + const gchar* arg, + gpointer self) { gchar* result; - result = __lambda7_ ((MamanReturnBar*) self, _sender, arg); + result = _vala_lambda3_ ((MamanReturnBar*) self, _sender, arg); return result; } @@ -898,8 +898,8 @@ maman_return_bar_run (MamanReturnBar* self) _vala_assert (_tmp1_ == 2, "++counter == 2"); _tmp2_ = maman_return_foo_new (); foo = _tmp2_; - g_signal_connect_object (foo, "int-activated", (GCallback) ___lambda6__maman_return_foo_int_activated, self, 0); - g_signal_connect_object (foo, "string-activated", (GCallback) ___lambda7__maman_return_foo_string_activated, self, 0); + g_signal_connect_object (foo, "int-activated", (GCallback) __vala_lambda2__maman_return_foo_int_activated, self, 0); + g_signal_connect_object (foo, "string-activated", (GCallback) __vala_lambda3__maman_return_foo_string_activated, self, 0); _tmp3_ = stdout; g_signal_emit (foo, maman_return_foo_signals[MAMAN_RETURN_FOO_INT_ACTIVATED_SIGNAL], 0, 3, &_tmp4_); fprintf (_tmp3_, " %d", _tmp4_); diff --git a/tests/objects/with-nested-in-lambda.c-expected b/tests/objects/with-nested-in-lambda.c-expected index fede53a55..7f47ad280 100644 --- a/tests/objects/with-nested-in-lambda.c-expected +++ b/tests/objects/with-nested-in-lambda.c-expected @@ -81,8 +81,8 @@ VALA_EXTERN void run (FooFunc func, static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__foo_func (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__foo_func (gpointer self); gint foo_bar (Foo* self) @@ -332,7 +332,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { { _vala_assert (foo_bar (_data1_->foo) == 23, "bar () == 23"); @@ -340,9 +340,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -354,7 +354,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = foo_new (); _data1_->foo = _tmp0_; - run (___lambda4__foo_func, _data1_); + run (__vala_lambda0__foo_func, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/objects/with-nested-signal.c-expected b/tests/objects/with-nested-signal.c-expected index ea858c0de..85724dc5a 100644 --- a/tests/objects/with-nested-signal.c-expected +++ b/tests/objects/with-nested-signal.c-expected @@ -112,11 +112,11 @@ static GType bar_get_type_once (void); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void ____lambda4_ (Block1Data* _data1_); -static void _____lambda4__foo_manam (Foo* _sender, - gpointer self); -static void ______lambda5_ (Block1Data* _data1_); -static void _______lambda5__foo_manam (Foo* _sender, +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__foo_manam (Foo* _sender, + gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_); +static void __vala_lambda1__foo_manam (Foo* _sender, gpointer self); static gint @@ -433,29 +433,29 @@ block1_data_unref (void * _userdata_) } static void -____lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _vala_assert (foo_foo (_data1_->foo) == 23, "foo () == 23"); } static void -_____lambda4__foo_manam (Foo* _sender, - gpointer self) +__vala_lambda0__foo_manam (Foo* _sender, + gpointer self) { - ____lambda4_ (self); + _vala_lambda0_ (self); } static void -______lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { _vala_assert (foo_foo (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo)) == 42, "foo () == 42"); } static void -_______lambda5__foo_manam (Foo* _sender, +__vala_lambda1__foo_manam (Foo* _sender, gpointer self) { - ______lambda5_ (self); + _vala_lambda1_ (self); } static void @@ -471,9 +471,9 @@ _vala_main (void) _tmp1_ = bar_new (); _data1_->bar = _tmp1_; { - g_signal_connect_data (_data1_->foo, "manam", (GCallback) _____lambda4__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_data1_->foo, "manam", (GCallback) __vala_lambda0__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); { - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), "manam", (GCallback) _______lambda5__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), "manam", (GCallback) __vala_lambda1__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); } } g_signal_emit (_data1_->foo, foo_signals[FOO_MANAM_SIGNAL], 0); diff --git a/tests/objects/with-nested-unambigous-signal.c-expected b/tests/objects/with-nested-unambigous-signal.c-expected index d2a0a367d..425482bb8 100644 --- a/tests/objects/with-nested-unambigous-signal.c-expected +++ b/tests/objects/with-nested-unambigous-signal.c-expected @@ -82,9 +82,9 @@ static GType foo_get_type_once (void); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void ____lambda4_ (Block1Data* _data1_); -static void _____lambda4__foo_manam (Foo* _sender, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__foo_manam (Foo* _sender, + gpointer self); gint foo_bar (Foo* self) @@ -328,16 +328,16 @@ block1_data_unref (void * _userdata_) } static void -____lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _vala_assert (foo_bar (_data1_->foo) == 23, "bar () == 23"); } static void -_____lambda4__foo_manam (Foo* _sender, - gpointer self) +__vala_lambda0__foo_manam (Foo* _sender, + gpointer self) { - ____lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -350,7 +350,7 @@ _vala_main (void) _tmp0_ = foo_new (); _data1_->foo = _tmp0_; { - g_signal_connect_data (_data1_->foo, "manam", (GCallback) _____lambda4__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + g_signal_connect_data (_data1_->foo, "manam", (GCallback) __vala_lambda0__foo_manam, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); } g_signal_emit (_data1_->foo, foo_signals[FOO_MANAM_SIGNAL], 0); block1_data_unref (_data1_); |