diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2023-04-06 15:14:52 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2023-04-06 16:11:37 +0200 |
| commit | 8d7e4b7a1e5881dd5b93a99a1ec3ee8529d67f35 (patch) | |
| tree | aab61576077b16aa7726705b154acce7f23f383a | |
| parent | 6ad0e233e6f67f5b30810203b43b160e4c529f37 (diff) | |
| download | vala-8d7e4b7a1e5881dd5b93a99a1ec3ee8529d67f35.tar.gz | |
codegen: Stabilize CCode.cname for backing method of lamdba expression
Move lambda_id generation to CCodeAttribute and use _vala_lambda%d_ pattern
98 files changed, 1545 insertions, 1542 deletions
diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala index 74a366524..f47eb3b7c 100644 --- a/codegen/valaccodeattribute.vala +++ b/codegen/valaccodeattribute.vala @@ -25,6 +25,8 @@ * Cache for the CCode attribute */ public class Vala.CCodeAttribute : AttributeCache { + private static int next_lambda_id = 0; + private weak CodeNode node; private weak Symbol? sym; private Attribute ccode; @@ -755,6 +757,9 @@ public class Vala.CCodeAttribute : AttributeCache { return "_dynamic_%s%d".printf (sym.name, dynamic_method_id++); } else if (sym is Method) { unowned Method m = (Method) sym; + if (m.parent_node is LambdaExpression) { + return "_vala_lambda%d_".printf (next_lambda_id++); + } if (m.is_async_callback) { return "%s_co".printf (get_ccode_real_name ((Method) m.parent_symbol)); } diff --git a/tests/arrays/resize-local-size-captured.c-expected b/tests/arrays/resize-local-size-captured.c-expected index 190b45001..71e5e5d91 100644 --- a/tests/arrays/resize-local-size-captured.c-expected +++ b/tests/arrays/resize-local-size-captured.c-expected @@ -17,8 +17,8 @@ struct _Block1Data { 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); static void _vala_array_add1 (gint* * array, gint* length, gint* size, @@ -43,7 +43,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gint _tmp0_; _tmp0_ = 1; @@ -54,9 +54,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -88,7 +88,7 @@ _vala_main (void) _data1_->a = _tmp0_; _data1_->a_length1 = (10 * 1024) * 1024; _data1_->_a_size_ = _data1_->a_length1; - func = ___lambda4__foo_func; + func = __vala_lambda0__foo_func; func_target = block1_data_ref (_data1_); func_target_destroy_notify = block1_data_unref; _tmp1_ = func; diff --git a/tests/asynchronous/bug595755.c-expected b/tests/asynchronous/bug595755.c-expected index ab26da554..6f471d479 100644 --- a/tests/asynchronous/bug595755.c-expected +++ b/tests/asynchronous/bug595755.c-expected @@ -66,9 +66,9 @@ VALA_EXTERN void foo_do_foo (Foo* self, VALA_EXTERN void foo_do_foo_finish (Foo* self, GAsyncResult* _res_); static gboolean foo_do_foo_co (FooDoFooData* _data_); -static void __lambda4_ (Foo* self); -static void ___lambda4__foo_bar (Foo* _sender, - gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__foo_bar (Foo* _sender, + gpointer self); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static GType foo_get_type_once (void); @@ -114,15 +114,15 @@ foo_do_foo_finish (Foo* self, } static void -__lambda4_ (Foo* self) +_vala_lambda0_ (Foo* self) { } static void -___lambda4__foo_bar (Foo* _sender, - gpointer self) +__vala_lambda0__foo_bar (Foo* _sender, + gpointer self) { - __lambda4_ ((Foo*) self); + _vala_lambda0_ ((Foo*) self); } static gboolean @@ -135,7 +135,7 @@ foo_do_foo_co (FooDoFooData* _data_) g_assert_not_reached (); } _state_0: - g_signal_connect_object (_data_->self, "bar", (GCallback) ___lambda4__foo_bar, _data_->self, 0); + g_signal_connect_object (_data_->self, "bar", (GCallback) __vala_lambda0__foo_bar, _data_->self, 0); g_task_return_pointer (_data_->_async_result, _data_, NULL); if (_data_->_state_ != 0) { while (!g_task_get_completed (_data_->_async_result)) { diff --git a/tests/asynchronous/bug598697.c-expected b/tests/asynchronous/bug598697.c-expected index 813b09b99..5a21a10fe 100644 --- a/tests/asynchronous/bug598697.c-expected +++ b/tests/asynchronous/bug598697.c-expected @@ -81,8 +81,8 @@ VALA_EXTERN void foo_do_foo (Foo* self, VALA_EXTERN void foo_do_foo_finish (Foo* self, GAsyncResult* _res_); static gboolean foo_do_foo_co (FooDoFooData* _data_); -static void __lambda4_ (Foo* self); -static void ___lambda4__func (gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__func (gpointer self); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static void foo_finalize (Foo * obj); @@ -129,14 +129,14 @@ foo_do_foo_finish (Foo* self, } static void -__lambda4_ (Foo* self) +_vala_lambda0_ (Foo* self) { } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ ((Foo*) self); + _vala_lambda0_ ((Foo*) self); } static gboolean @@ -149,7 +149,7 @@ foo_do_foo_co (FooDoFooData* _data_) g_assert_not_reached (); } _state_0: - _data_->f = ___lambda4__func; + _data_->f = __vala_lambda0__func; _data_->f_target = foo_ref (_data_->self); _data_->f_target_destroy_notify = foo_unref; (_data_->f_target_destroy_notify == NULL) ? NULL : (_data_->f_target_destroy_notify (_data_->f_target), NULL); diff --git a/tests/asynchronous/bug612641.c-expected b/tests/asynchronous/bug612641.c-expected index 114d4a34e..e408ca453 100644 --- a/tests/asynchronous/bug612641.c-expected +++ b/tests/asynchronous/bug612641.c-expected @@ -86,8 +86,8 @@ static FooFunc foo_foo_finish (Foo* self, gpointer* result_target, GDestroyNotify* result_target_destroy_notify); static gboolean foo_foo_co (FooFooData* _data_); -static void __lambda4_ (Foo* self); -static void ___lambda4__foo_func (gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__foo_func (gpointer self); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static void foo_finalize (Foo * obj); @@ -145,14 +145,14 @@ foo_foo_finish (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 gboolean @@ -165,7 +165,7 @@ foo_foo_co (FooFooData* _data_) g_assert_not_reached (); } _state_0: - _data_->_tmp0_ = ___lambda4__foo_func; + _data_->_tmp0_ = __vala_lambda0__foo_func; _data_->_tmp0__target = foo_ref (_data_->self); _data_->_tmp0__target_destroy_notify = foo_unref; _data_->result_target = _data_->_tmp0__target; diff --git a/tests/asynchronous/bug639591.c-expected b/tests/asynchronous/bug639591.c-expected index 4a766fb84..5e81e0622 100644 --- a/tests/asynchronous/bug639591.c-expected +++ b/tests/asynchronous/bug639591.c-expected @@ -50,8 +50,8 @@ VALA_EXTERN void foo_finish (GAsyncResult* _res_); static gboolean foo_co (FooData* _data_); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__deleg (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__deleg (gpointer self); static void _vala_main (void); static void @@ -112,15 +112,15 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _data1_->deleg (_data1_->deleg_target); } static void -___lambda4__deleg (gpointer self) +__vala_lambda0__deleg (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static gboolean @@ -143,7 +143,7 @@ foo_co (FooData* _data_) _data_->_data1_->deleg_target = _data_->deleg_target; _data_->_data1_->deleg_target_destroy_notify = _data_->deleg_target_destroy_notify; _data_->_data1_->_async_data_ = _data_; - _data_->d = ___lambda4__deleg; + _data_->d = __vala_lambda0__deleg; _data_->d_target = block1_data_ref (_data_->_data1_); _data_->d_target_destroy_notify = block1_data_unref; (_data_->d_target_destroy_notify == NULL) ? NULL : (_data_->d_target_destroy_notify (_data_->d_target), NULL); diff --git a/tests/asynchronous/bug640721.c-expected b/tests/asynchronous/bug640721.c-expected index 49bc7d28f..ad01d883a 100644 --- a/tests/asynchronous/bug640721.c-expected +++ b/tests/asynchronous/bug640721.c-expected @@ -41,12 +41,12 @@ static gboolean foo_co (FooData* _data_); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GObject* s, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_data_free (gpointer _data) @@ -117,9 +117,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* s, - GAsyncResult* r) +_vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r) { g_return_if_fail ((s == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (s, G_TYPE_OBJECT)); g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (r, g_async_result_get_type ())); @@ -128,11 +128,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -145,7 +145,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data1_->loop = _tmp0_; - foo (___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + foo (__vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/bug641182.c-expected b/tests/asynchronous/bug641182.c-expected index 6dc8b07fd..86cb1d4b4 100644 --- a/tests/asynchronous/bug641182.c-expected +++ b/tests/asynchronous/bug641182.c-expected @@ -106,8 +106,8 @@ VALA_EXTERN void test_finish (GAsyncResult* _res_); static gboolean test_co (TestData* _data_); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__bar (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__bar (gpointer self); static void _vala_main (void); static inline gpointer @@ -405,7 +405,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gint _tmp0_; _tmp0_ = _data1_->i; @@ -413,9 +413,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__bar (gpointer self) +__vala_lambda0__bar (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static gboolean @@ -434,7 +434,7 @@ test_co (TestData* _data_) _data_->_tmp0_ = foo_new (); _data_->foo = _data_->_tmp0_; _data_->_data1_->i = 0; - foo_set_bar (_data_->foo, ___lambda4__bar, _data_->_data1_); + foo_set_bar (_data_->foo, __vala_lambda0__bar, _data_->_data1_); _data_->_tmp1_ = NULL; _data_->_tmp1__target = NULL; _data_->_tmp1_ = foo_get_bar (_data_->foo, &_data_->_tmp1__target); diff --git a/tests/asynchronous/bug652252.c-expected b/tests/asynchronous/bug652252.c-expected index 163e584e2..9d790974f 100644 --- a/tests/asynchronous/bug652252.c-expected +++ b/tests/asynchronous/bug652252.c-expected @@ -96,12 +96,12 @@ 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_, - GObject* s, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_real_foo_data_free (gpointer _data) @@ -291,9 +291,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* s, - GAsyncResult* r) +_vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r) { g_return_if_fail ((s == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (s, G_TYPE_OBJECT)); g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (r, g_async_result_get_type ())); @@ -302,11 +302,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -322,7 +322,7 @@ _vala_main (void) _data1_->loop = _tmp0_; _tmp1_ = bar_new (); _data1_->bar = _tmp1_; - foo_foo (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + foo_foo (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/bug654337.c-expected b/tests/asynchronous/bug654337.c-expected index 3e9d437c1..cae63009c 100644 --- a/tests/asynchronous/bug654337.c-expected +++ b/tests/asynchronous/bug654337.c-expected @@ -50,8 +50,8 @@ VALA_EXTERN void foo_finish (GAsyncResult* _res_); static gboolean foo_co (FooData* _data_); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void _vala_main (void); static void @@ -110,7 +110,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { GType t_type; GBoxedCopyFunc t_dup_func; @@ -124,10 +124,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; } @@ -147,7 +147,7 @@ foo_co (FooData* _data_) _data_->_data1_->t_dup_func = _data_->t_dup_func; _data_->_data1_->t_destroy_func = _data_->t_destroy_func; _data_->_data1_->_async_data_ = _data_; - _data_->c = ___lambda4__gsource_func; + _data_->c = __vala_lambda0__gsource_func; _data_->c_target = block1_data_ref (_data_->_data1_); _data_->c_target_destroy_notify = block1_data_unref; (_data_->c_target_destroy_notify == NULL) ? NULL : (_data_->c_target_destroy_notify (_data_->c_target), NULL); diff --git a/tests/asynchronous/bug661961.c-expected b/tests/asynchronous/bug661961.c-expected index 0e00fb4b5..f8605d2de 100644 --- a/tests/asynchronous/bug661961.c-expected +++ b/tests/asynchronous/bug661961.c-expected @@ -56,12 +56,12 @@ static gboolean foo_co (FooData* _data_); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GObject* s, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_data_free (gpointer _data) @@ -147,9 +147,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* s, - GAsyncResult* r) +_vala_lambda0_ (Block1Data* _data1_, + GObject* s, + GAsyncResult* r) { gpointer _tmp0_; gchar* _tmp1_; @@ -163,11 +163,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -180,7 +180,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data1_->loop = _tmp0_; - foo (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, "test", ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + foo (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, "test", __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/bug710103.c-expected b/tests/asynchronous/bug710103.c-expected index 232582fc5..087bff498 100644 --- a/tests/asynchronous/bug710103.c-expected +++ b/tests/asynchronous/bug710103.c-expected @@ -102,12 +102,12 @@ static gpointer foo_parent_class = NULL; VALA_EXTERN void iostream (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GObject* obj, - GAsyncResult* res); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* obj, + GAsyncResult* res); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) static void foo_bar_data_free (gpointer _data); @@ -140,20 +140,20 @@ static GType foo_get_type_once (void); static void _vala_main (void); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static void __lambda5_ (Block2Data* _data2_, - GObject* obj, - GAsyncResult* res); +static void _vala_lambda1_ (Block2Data* _data2_, + GObject* obj, + GAsyncResult* res); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static void __lambda6_ (Block3Data* _data3_, - GObject* obj, - GAsyncResult* res); -static void ___lambda6__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void ___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda2_ (Block3Data* _data3_, + GObject* obj, + GAsyncResult* res); +static void __vala_lambda2__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static Block1Data* block1_data_ref (Block1Data* _data1_) @@ -174,9 +174,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* obj, - GAsyncResult* res) +_vala_lambda0_ (Block1Data* _data1_, + GObject* obj, + GAsyncResult* res) { GError* _inner_error0_ = NULL; g_return_if_fail ((obj == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (obj, G_TYPE_OBJECT)); @@ -201,11 +201,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -218,7 +218,7 @@ iostream (void) _data1_->_ref_count_ = 1; _data1_->is0 = NULL; is1 = NULL; - g_io_stream_splice_async (_data1_->is0, is1, G_IO_STREAM_SPLICE_NONE, G_PRIORITY_DEFAULT, NULL, ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + g_io_stream_splice_async (_data1_->is0, is1, G_IO_STREAM_SPLICE_NONE, G_PRIORITY_DEFAULT, NULL, __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); _g_object_unref0 (is1); block1_data_unref (_data1_); _data1_ = NULL; @@ -519,9 +519,9 @@ block3_data_unref (void * _userdata_) } static void -__lambda6_ (Block3Data* _data3_, - GObject* obj, - GAsyncResult* res) +_vala_lambda2_ (Block3Data* _data3_, + GObject* obj, + GAsyncResult* res) { Block2Data* _data2_; _data2_ = _data3_->_data2_; @@ -533,18 +533,18 @@ __lambda6_ (Block3Data* _data3_, } static void -___lambda6__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda2__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda6_ (self, source_object, res); + _vala_lambda2_ (self, source_object, res); block3_data_unref (self); } static void -__lambda5_ (Block2Data* _data2_, - GObject* obj, - GAsyncResult* res) +_vala_lambda1_ (Block2Data* _data2_, + GObject* obj, + GAsyncResult* res) { Block3Data* _data3_; Foo* _tmp0_; @@ -556,17 +556,17 @@ __lambda5_ (Block2Data* _data2_, _tmp0_ = foo_create_foo_finish (res); _data3_->foo = _tmp0_; _vala_assert (_data3_->foo->manam == 42, "foo.manam == 42"); - foo_bar (_data3_->foo, ___lambda6__gasync_ready_callback, block3_data_ref (_data3_)); + foo_bar (_data3_->foo, __vala_lambda2__gasync_ready_callback, block3_data_ref (_data3_)); block3_data_unref (_data3_); _data3_ = NULL; } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (self, source_object, res); + _vala_lambda1_ (self, source_object, res); block2_data_unref (self); } @@ -579,7 +579,7 @@ _vala_main (void) _data2_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data2_->loop = _tmp0_; - foo_create_foo_async (___lambda5__gasync_ready_callback, block2_data_ref (_data2_)); + foo_create_foo_async (__vala_lambda1__gasync_ready_callback, block2_data_ref (_data2_)); g_main_loop_run (_data2_->loop); block2_data_unref (_data2_); _data2_ = NULL; diff --git a/tests/asynchronous/bug762819.c-expected b/tests/asynchronous/bug762819.c-expected index 2403e61d9..7267c285e 100644 --- a/tests/asynchronous/bug762819.c-expected +++ b/tests/asynchronous/bug762819.c-expected @@ -120,12 +120,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_, - GObject* obj, - GAsyncResult* res); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* obj, + GAsyncResult* res); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -341,9 +341,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* obj, - GAsyncResult* res) +_vala_lambda0_ (Block1Data* _data1_, + GObject* obj, + GAsyncResult* res) { gchar** _result_ = NULL; gchar** _tmp0_; @@ -365,11 +365,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -385,7 +385,7 @@ _vala_main (void) _data1_->loop = _tmp0_; _tmp1_ = foo_new (); _data1_->foo = _tmp1_; - bar_get_string_async (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_BAR, Bar), ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + bar_get_string_async (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_BAR, Bar), __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/bug777242.c-expected b/tests/asynchronous/bug777242.c-expected index 0b15be9cc..1c00d341e 100644 --- a/tests/asynchronous/bug777242.c-expected +++ b/tests/asynchronous/bug777242.c-expected @@ -47,8 +47,8 @@ static gboolean run_co (RunData* _data_); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void run_data_free (gpointer _data) @@ -128,7 +128,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gboolean result; run (NULL, NULL); @@ -138,10 +138,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; } @@ -154,7 +154,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data1_->loop = _tmp0_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda4__gsource_func, block1_data_ref (_data1_), block1_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __vala_lambda0__gsource_func, block1_data_ref (_data1_), block1_data_unref); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/bug783543.c-expected b/tests/asynchronous/bug783543.c-expected index 0da28c1f9..30c781bc1 100644 --- a/tests/asynchronous/bug783543.c-expected +++ b/tests/asynchronous/bug783543.c-expected @@ -75,10 +75,10 @@ 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__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_bar_data_free (gpointer _data) @@ -221,17 +221,17 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { g_main_loop_quit (_data1_->loop); } 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_ (self); + _vala_lambda0_ (self); block1_data_unref (self); } @@ -248,7 +248,7 @@ _vala_main (void) _data1_->loop = _tmp0_; _tmp1_ = foo_new (); foo = _tmp1_; - foo_bar (foo, ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + foo_bar (foo, __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); _g_object_unref0 (foo); block1_data_unref (_data1_); diff --git a/tests/asynchronous/bug793158.c-expected b/tests/asynchronous/bug793158.c-expected index 3f1c976be..3eda4d0d1 100644 --- a/tests/asynchronous/bug793158.c-expected +++ b/tests/asynchronous/bug793158.c-expected @@ -79,11 +79,11 @@ 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 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); GQuark foo_error_quark (void) @@ -229,8 +229,8 @@ foo_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)); @@ -240,11 +240,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 @@ -259,7 +259,7 @@ _vala_main (void) loop = _tmp0_; _tmp1_ = foo_new (); foo = _tmp1_; - foo_bar (foo, ___lambda4__gasync_ready_callback, NULL); + foo_bar (foo, __vala_lambda0__gasync_ready_callback, NULL); _tmp2_ = loop; g_main_loop_run (_tmp2_); _g_object_unref0 (foo); diff --git a/tests/asynchronous/catch-error-scope.c-expected b/tests/asynchronous/catch-error-scope.c-expected index 035b2b10f..7ed244639 100644 --- a/tests/asynchronous/catch-error-scope.c-expected +++ b/tests/asynchronous/catch-error-scope.c-expected @@ -61,12 +61,12 @@ static gboolean foo_co (FooData* _data_); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* res); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* res); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); GQuark foo_error_quark (void) @@ -204,9 +204,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* res) +_vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* res) { g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (res, g_async_result_get_type ())); @@ -215,11 +215,11 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } @@ -232,7 +232,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data1_->loop = _tmp0_; - foo (___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); + foo (__vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); g_main_loop_run (_data1_->loop); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/asynchronous/catch-in-finally.c-expected b/tests/asynchronous/catch-in-finally.c-expected index 4d83d8e91..136fdf2af 100644 --- a/tests/asynchronous/catch-in-finally.c-expected +++ b/tests/asynchronous/catch-in-finally.c-expected @@ -116,16 +116,16 @@ VALA_EXTERN void run (GAsyncReadyCallback _callback_, gpointer _user_data_); VALA_EXTERN void run_finish (GAsyncResult* _res_); static gboolean run_co (RunData* _data_); -static void __lambda4_ (GObject* o, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void __lambda5_ (GObject* o, - GAsyncResult* r); -static void ___lambda5__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); +static void _vala_lambda1_ (GObject* o, + GAsyncResult* r); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void _vala_main (void); GQuark @@ -599,8 +599,8 @@ run_finish (GAsyncResult* _res_) } static void -__lambda4_ (GObject* o, - GAsyncResult* r) +_vala_lambda0_ (GObject* o, + GAsyncResult* r) { GError* _inner_error0_ = NULL; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -638,16 +638,16 @@ __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 -__lambda5_ (GObject* o, - GAsyncResult* r) +_vala_lambda1_ (GObject* o, + GAsyncResult* r) { GError* _inner_error0_ = NULL; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -688,11 +688,11 @@ __lambda5_ (GObject* o, } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (source_object, res); + _vala_lambda1_ (source_object, res); } static gboolean @@ -705,8 +705,8 @@ run_co (RunData* _data_) g_assert_not_reached (); } _state_0: - foo (___lambda4__gasync_ready_callback, NULL); - bar (___lambda5__gasync_ready_callback, NULL); + foo (__vala_lambda0__gasync_ready_callback, NULL); + bar (__vala_lambda1__gasync_ready_callback, NULL); g_task_return_pointer (_data_->_async_result, _data_, NULL); if (_data_->_state_ != 0) { while (!g_task_get_completed (_data_->_async_result)) { diff --git a/tests/asynchronous/closures.c-expected b/tests/asynchronous/closures.c-expected index bc5a2c38b..9f9153c5c 100644 --- a/tests/asynchronous/closures.c-expected +++ b/tests/asynchronous/closures.c-expected @@ -60,8 +60,8 @@ VALA_EXTERN void foo_finish (GAsyncResult* _res_); static gboolean foo_co (FooData* _data_); 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 gboolean _foo_co_gsource_func (gpointer self); static void _vala_main (void); @@ -117,7 +117,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gchar* _tmp0_; _data1_->func = NULL; @@ -128,9 +128,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static gboolean @@ -162,7 +162,7 @@ foo_co (FooData* _data_) _data_->_data1_->func_target = NULL; _data_->_tmp0_ = g_strdup ("hello"); _data_->_data1_->bar = _data_->_tmp0_; - _data_->foobar = ___lambda4__func; + _data_->foobar = __vala_lambda0__func; _data_->foobar_target = block1_data_ref (_data_->_data1_); _data_->foobar_target_destroy_notify = block1_data_unref; _data_->foobar (_data_->foobar_target); diff --git a/tests/asynchronous/finish-name.c-expected b/tests/asynchronous/finish-name.c-expected index 6c0ff755f..f4d724799 100644 --- a/tests/asynchronous/finish-name.c-expected +++ b/tests/asynchronous/finish-name.c-expected @@ -201,29 +201,29 @@ static gboolean manam_co (ManamData* _data_); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void __lambda5_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r); -static void ___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void __lambda6_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r); -static void ___lambda6__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void __lambda7_ (GObject* o, - GAsyncResult* r); -static void ___lambda7__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); +static void _vala_lambda2_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r); +static void __vala_lambda2__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); +static void _vala_lambda3_ (GObject* o, + GAsyncResult* r); +static void __vala_lambda3__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_construct_async_data_free (gpointer _data) @@ -841,9 +841,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r) +_vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r) { gchar* res = NULL; gchar* _tmp0_; @@ -856,18 +856,18 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } static void -__lambda5_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r) +_vala_lambda1_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r) { gchar* res = NULL; gchar* _tmp0_; @@ -880,18 +880,18 @@ __lambda5_ (Block1Data* _data1_, } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (self, source_object, res); + _vala_lambda1_ (self, source_object, res); block1_data_unref (self); } static void -__lambda6_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r) +_vala_lambda2_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r) { gchar* res = NULL; gchar* _tmp0_; @@ -904,17 +904,17 @@ __lambda6_ (Block1Data* _data1_, } static void -___lambda6__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda2__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda6_ (self, source_object, res); + _vala_lambda2_ (self, source_object, res); block1_data_unref (self); } static void -__lambda7_ (GObject* o, - GAsyncResult* r) +_vala_lambda3_ (GObject* o, + GAsyncResult* r) { gchar* res = NULL; gchar* _tmp0_; @@ -930,11 +930,11 @@ __lambda7_ (GObject* o, } static void -___lambda7__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda3__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda7_ (source_object, res); + _vala_lambda3_ (source_object, res); } static void @@ -952,12 +952,12 @@ _vala_main (void) loop = _tmp0_; _tmp1_ = foo_new (); _data1_->foo = _tmp1_; - foo_bar (_data1_->foo, ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); - foo_baz (_data1_->foo, ___lambda5__gasync_ready_callback, block1_data_ref (_data1_)); + foo_bar (_data1_->foo, __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); + foo_baz (_data1_->foo, __vala_lambda1__gasync_ready_callback, block1_data_ref (_data1_)); _tmp2_ = bar_new (); _data1_->bar = _tmp2_; - foo_baz (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), ___lambda6__gasync_ready_callback, block1_data_ref (_data1_)); - manam (___lambda7__gasync_ready_callback, NULL); + foo_baz (G_TYPE_CHECK_INSTANCE_CAST (_data1_->bar, TYPE_FOO, Foo), __vala_lambda2__gasync_ready_callback, block1_data_ref (_data1_)); + manam (__vala_lambda3__gasync_ready_callback, NULL); _tmp3_ = loop; g_main_loop_run (_tmp3_); block1_data_unref (_data1_); diff --git a/tests/asynchronous/nowrapper.c-expected b/tests/asynchronous/nowrapper.c-expected index a5b1ea39c..e20a0b5ab 100644 --- a/tests/asynchronous/nowrapper.c-expected +++ b/tests/asynchronous/nowrapper.c-expected @@ -114,18 +114,18 @@ 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_, - GObject* o, - GAsyncResult* r); -static void ___lambda4__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); -static void __lambda5_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r); -static void ___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r); +static void __vala_lambda0__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void ifoo_default_init (IFooIface * iface, @@ -355,9 +355,9 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r) +_vala_lambda0_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r) { g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (r, g_async_result_get_type ())); @@ -365,18 +365,18 @@ __lambda4_ (Block1Data* _data1_, } 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_ (self, source_object, res); + _vala_lambda0_ (self, source_object, res); block1_data_unref (self); } static void -__lambda5_ (Block1Data* _data1_, - GObject* o, - GAsyncResult* r) +_vala_lambda1_ (Block1Data* _data1_, + GObject* o, + GAsyncResult* r) { GMainLoop* _tmp0_; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -387,11 +387,11 @@ __lambda5_ (Block1Data* _data1_, } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (self, source_object, res); + _vala_lambda1_ (self, source_object, res); block1_data_unref (self); } @@ -409,8 +409,8 @@ _vala_main (void) loop = _tmp0_; _tmp1_ = foo_new (); _data1_->foo = _tmp1_; - FOO_GET_CLASS (_data1_->foo)->bar (_data1_->foo, ___lambda4__gasync_ready_callback, block1_data_ref (_data1_)); - IFOO_GET_INTERFACE (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_IFOO, IFoo))->manam (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_IFOO, IFoo), ___lambda5__gasync_ready_callback, block1_data_ref (_data1_)); + FOO_GET_CLASS (_data1_->foo)->bar (_data1_->foo, __vala_lambda0__gasync_ready_callback, block1_data_ref (_data1_)); + IFOO_GET_INTERFACE (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_IFOO, IFoo))->manam (G_TYPE_CHECK_INSTANCE_CAST (_data1_->foo, TYPE_IFOO, IFoo), __vala_lambda1__gasync_ready_callback, block1_data_ref (_data1_)); _tmp2_ = loop; g_main_loop_run (_tmp2_); block1_data_unref (_data1_); diff --git a/tests/asynchronous/result-pos.c-expected b/tests/asynchronous/result-pos.c-expected index ff6b90da5..ca0285500 100644 --- a/tests/asynchronous/result-pos.c-expected +++ b/tests/asynchronous/result-pos.c-expected @@ -81,16 +81,16 @@ static void run_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); 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 __lambda5_ (GObject* o, - GAsyncResult* r); -static void ___lambda5__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); +static void _vala_lambda1_ (GObject* o, + GAsyncResult* r); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static void foo_data_free (gpointer _data) @@ -301,8 +301,8 @@ run_co (RunData* _data_) } static void -__lambda4_ (GObject* o, - GAsyncResult* r) +_vala_lambda0_ (GObject* o, + GAsyncResult* r) { gint i = 0; gint _tmp0_ = 0; @@ -314,16 +314,16 @@ __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 -__lambda5_ (GObject* o, - GAsyncResult* r) +_vala_lambda1_ (GObject* o, + GAsyncResult* r) { GError* _inner_error0_ = NULL; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -353,11 +353,11 @@ __lambda5_ (GObject* o, } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (source_object, res); + _vala_lambda1_ (source_object, res); } static void @@ -368,8 +368,8 @@ _vala_main (void) _tmp0_ = g_main_loop_new (NULL, FALSE); _g_main_loop_unref0 (loop); loop = _tmp0_; - foo (23, ___lambda4__gasync_ready_callback, NULL); - bar (42, ___lambda5__gasync_ready_callback, NULL); + foo (23, __vala_lambda0__gasync_ready_callback, NULL); + bar (42, __vala_lambda1__gasync_ready_callback, NULL); run (NULL, NULL); _tmp1_ = loop; g_main_loop_run (_tmp1_); diff --git a/tests/basic-types/gptrarray.c-expected b/tests/basic-types/gptrarray.c-expected index bc641afa3..d771e84f1 100644 --- a/tests/basic-types/gptrarray.c-expected +++ b/tests/basic-types/gptrarray.c-expected @@ -76,16 +76,16 @@ static void _vala_main (void); static void _g_object_unref0_ (gpointer var); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gint ___lambda1__gcompare_data_func (gconstpointer a, - gconstpointer b, - gpointer self); +static gint __vala_lambda0__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint _compare_foo_gcompare_func (gconstpointer a, gconstpointer b); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static gint ___lambda2__gcompare_data_func (gconstpointer a, - gconstpointer b, - gpointer self); +static gint __vala_lambda1__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self); static gint _compare_foo_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); @@ -215,9 +215,9 @@ block1_data_unref (void * _userdata_) } static gint -__lambda1_ (Block1Data* _data1_, - gconstpointer** a, - gconstpointer** b) +_vala_lambda0_ (Block1Data* _data1_, + gconstpointer** a, + gconstpointer** b) { GPtrArray* self; gint result; @@ -227,12 +227,12 @@ __lambda1_ (Block1Data* _data1_, } static gint -___lambda1__gcompare_data_func (gconstpointer a, - gconstpointer b, - gpointer self) +__vala_lambda0__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) { gint result; - result = __lambda1_ (self, a, b); + result = _vala_lambda0_ (self, a, b); return result; } @@ -246,7 +246,7 @@ vala_g_ptr_array_sort (GPtrArray* self, _data1_->_ref_count_ = 1; _data1_->self = g_ptr_array_ref (self); _data1_->compare_func = compare_func; - g_ptr_array_sort_with_data (self, ___lambda1__gcompare_data_func, _data1_); + g_ptr_array_sort_with_data (self, __vala_lambda0__gcompare_data_func, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } @@ -281,9 +281,9 @@ block2_data_unref (void * _userdata_) } static gint -__lambda2_ (Block2Data* _data2_, - gconstpointer** a, - gconstpointer** b) +_vala_lambda1_ (Block2Data* _data2_, + gconstpointer** a, + gconstpointer** b) { GPtrArray* self; gint result; @@ -293,12 +293,12 @@ __lambda2_ (Block2Data* _data2_, } static gint -___lambda2__gcompare_data_func (gconstpointer a, - gconstpointer b, - gpointer self) +__vala_lambda1__gcompare_data_func (gconstpointer a, + gconstpointer b, + gpointer self) { gint result; - result = __lambda2_ (self, a, b); + result = _vala_lambda1_ (self, a, b); return result; } @@ -314,7 +314,7 @@ vala_g_ptr_array_sort_with_data (GPtrArray* self, _data2_->self = g_ptr_array_ref (self); _data2_->compare_func = compare_func; _data2_->compare_func_target = compare_func_target; - g_ptr_array_sort_with_data (self, ___lambda2__gcompare_data_func, _data2_); + g_ptr_array_sort_with_data (self, __vala_lambda1__gcompare_data_func, _data2_); block2_data_unref (_data2_); _data2_ = NULL; } diff --git a/tests/chainup/method-lambda-base.c-expected b/tests/chainup/method-lambda-base.c-expected index f8ce82308..bfc708fd0 100644 --- a/tests/chainup/method-lambda-base.c-expected +++ b/tests/chainup/method-lambda-base.c-expected @@ -100,8 +100,8 @@ static void bar_execute (Bar* self, Func func, gpointer func_target); static void bar_real_foo (Foo* base); -static void __lambda4_ (Bar* self); -static void ___lambda4__func (gpointer self); +static void _vala_lambda0_ (Bar* self); +static void __vala_lambda0__func (gpointer self); VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); static GType bar_get_type_once (void); @@ -348,15 +348,15 @@ bar_execute (Bar* self, } static void -__lambda4_ (Bar* self) +_vala_lambda0_ (Bar* self) { FOO_CLASS (bar_parent_class)->foo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo)); } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ ((Bar*) self); + _vala_lambda0_ ((Bar*) self); } static void @@ -364,7 +364,7 @@ bar_real_foo (Foo* base) { Bar * self; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); - bar_execute (self, ___lambda4__func, self); + bar_execute (self, __vala_lambda0__func, self); } Bar* diff --git a/tests/chainup/no-chainup.c-expected b/tests/chainup/no-chainup.c-expected index 252628c60..698271f80 100644 --- a/tests/chainup/no-chainup.c-expected +++ b/tests/chainup/no-chainup.c-expected @@ -75,8 +75,8 @@ VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); VALA_EXTERN Foo* foo_new_foo (void); VALA_EXTERN Foo* foo_construct_foo (GType object_type); -static gboolean __lambda4_ (Foo* self); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Foo* self); +static gboolean __vala_lambda0__gsource_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 ; @@ -107,7 +107,7 @@ foo_new (void) } static gboolean -__lambda4_ (Foo* self) +_vala_lambda0_ (Foo* self) { gboolean result; result = TRUE; @@ -115,10 +115,10 @@ __lambda4_ (Foo* self) } static gboolean -___lambda4__gsource_func (gpointer self) +__vala_lambda0__gsource_func (gpointer self) { gboolean result; - result = __lambda4_ ((Foo*) self); + result = _vala_lambda0_ ((Foo*) self); return result; } @@ -130,7 +130,7 @@ foo_construct_foo (GType object_type) gpointer f_target; GDestroyNotify f_target_destroy_notify; self = (Foo*) g_type_create_instance (object_type); - f = ___lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = foo_ref (self); f_target_destroy_notify = foo_unref; f (f_target); diff --git a/tests/control-flow/bug628336.c-expected b/tests/control-flow/bug628336.c-expected index 1e5fb82ce..c389c5188 100644 --- a/tests/control-flow/bug628336.c-expected +++ b/tests/control-flow/bug628336.c-expected @@ -20,8 +20,8 @@ struct _Block1Data { static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean ____lambda4_ (Block1Data* _data1_); -static gboolean _____lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -48,7 +48,7 @@ block1_data_unref (void * _userdata_) } static gboolean -____lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { const gchar* _tmp0_; gboolean result; @@ -58,10 +58,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; } @@ -111,7 +111,7 @@ _vala_main (void) _data1_->bar = bar; _tmp5_ = _data1_->bar; _vala_assert (g_strcmp0 (_tmp5_, "bar") == 0, "bar == \"bar\""); - f = _____lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; _tmp6_ = f; diff --git a/tests/dbus/async-bus_client.c-expected b/tests/dbus/async-bus_client.c-expected index 97b1623ba..4fb82d344 100644 --- a/tests/dbus/async-bus_client.c-expected +++ b/tests/dbus/async-bus_client.c-expected @@ -87,11 +87,11 @@ static gboolean test_dbus_interface_set_property (GDBusConnection* connection, gpointer user_data); static void _test_unregister_object (gpointer user_data); 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); static const GDBusArgInfo _test_dbus_arg_info_get_test_result = {-1, "result", "i", NULL}; static const GDBusArgInfo * const _test_dbus_arg_info_get_test_in[] = {NULL}; @@ -325,8 +325,8 @@ _test_unregister_object (gpointer user_data) } static void -__lambda4_ (GObject* o, - GAsyncResult* r) +_vala_lambda0_ (GObject* o, + GAsyncResult* r) { GError* _inner_error0_ = NULL; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -373,11 +373,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 @@ -386,7 +386,7 @@ _vala_main (void) GMainLoop* _tmp0_; GMainLoop* _tmp1_; GError* _inner_error0_ = NULL; - g_async_initable_new_async (TYPE_TEST_PROXY, 0, NULL, ___lambda4__gasync_ready_callback, NULL, "g-flags", 0, "g-name", "org.example.Test", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/example/test", "g-interface-name", "org.example.Test", NULL); + g_async_initable_new_async (TYPE_TEST_PROXY, 0, NULL, __vala_lambda0__gasync_ready_callback, NULL, "g-flags", 0, "g-name", "org.example.Test", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/org/example/test", "g-interface-name", "org.example.Test", NULL); _tmp0_ = g_main_loop_new (NULL, FALSE); _g_main_loop_unref0 (main_loop); main_loop = _tmp0_; diff --git a/tests/dbus/async-connection_client.c-expected b/tests/dbus/async-connection_client.c-expected index 5fd5cd310..10b036a44 100644 --- a/tests/dbus/async-connection_client.c-expected +++ b/tests/dbus/async-connection_client.c-expected @@ -87,11 +87,11 @@ static gboolean test_dbus_interface_set_property (GDBusConnection* connection, gpointer user_data); static void _test_unregister_object (gpointer user_data); 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); static const GDBusArgInfo _test_dbus_arg_info_get_test_result = {-1, "result", "i", NULL}; static const GDBusArgInfo * const _test_dbus_arg_info_get_test_in[] = {NULL}; @@ -325,8 +325,8 @@ _test_unregister_object (gpointer user_data) } static void -__lambda4_ (GObject* o, - GAsyncResult* r) +_vala_lambda0_ (GObject* o, + GAsyncResult* r) { GError* _inner_error0_ = NULL; g_return_if_fail ((o == NULL) || G_TYPE_CHECK_INSTANCE_TYPE (o, G_TYPE_OBJECT)); @@ -373,11 +373,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 @@ -395,7 +395,7 @@ _vala_main (void) g_clear_error (&_inner_error0_); return; } - g_async_initable_new_async (TYPE_TEST_PROXY, 0, NULL, ___lambda4__gasync_ready_callback, NULL, "g-flags", 0, "g-name", "org.example.Test", "g-connection", conn, "g-object-path", "/org/example/test", "g-interface-name", "org.example.Test", NULL); + g_async_initable_new_async (TYPE_TEST_PROXY, 0, NULL, __vala_lambda0__gasync_ready_callback, NULL, "g-flags", 0, "g-name", "org.example.Test", "g-connection", conn, "g-object-path", "/org/example/test", "g-interface-name", "org.example.Test", NULL); _tmp1_ = g_main_loop_new (NULL, FALSE); _g_main_loop_unref0 (main_loop); main_loop = _tmp1_; diff --git a/tests/dbus/async-no-reply_client.c-expected b/tests/dbus/async-no-reply_client.c-expected index f32f69dda..c9bd510a9 100644 --- a/tests/dbus/async-no-reply_client.c-expected +++ b/tests/dbus/async-no-reply_client.c-expected @@ -214,14 +214,14 @@ static void run_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void _g_free0_ (gpointer var); -static GDBusMessage* __lambda4_ (Block1Data* _data1_, - GDBusConnection* conn, - GDBusMessage* message, - gboolean incoming); -static GDBusMessage* ___lambda4__gd_bus_message_filter_function (GDBusConnection* connection, - GDBusMessage* message, - gboolean incoming, - gpointer self); +static GDBusMessage* _vala_lambda0_ (Block1Data* _data1_, + GDBusConnection* conn, + GDBusMessage* message, + gboolean incoming); +static GDBusMessage* __vala_lambda0__gd_bus_message_filter_function (GDBusConnection* connection, + GDBusMessage* message, + gboolean incoming, + gpointer self); static void _vala_main (void); static void _vala_array_destroy (gpointer array, gssize array_length, @@ -746,10 +746,10 @@ _g_object_ref0 (gpointer self) } static GDBusMessage* -__lambda4_ (Block1Data* _data1_, - GDBusConnection* conn, - GDBusMessage* message, - gboolean incoming) +_vala_lambda0_ (Block1Data* _data1_, + GDBusConnection* conn, + GDBusMessage* message, + gboolean incoming) { gboolean _tmp0_ = FALSE; const gchar* _tmp1_; @@ -787,13 +787,13 @@ __lambda4_ (Block1Data* _data1_, } static GDBusMessage* -___lambda4__gd_bus_message_filter_function (GDBusConnection* connection, - GDBusMessage* message, - gboolean incoming, - gpointer self) +__vala_lambda0__gd_bus_message_filter_function (GDBusConnection* connection, + GDBusMessage* message, + gboolean incoming, + gpointer self) { GDBusMessage* result; - result = __lambda4_ (self, connection, message, incoming); + result = _vala_lambda0_ (self, connection, message, incoming); return result; } @@ -839,7 +839,7 @@ run_co (RunData* _data_) _data_->_tmp4_ = _data_->_tmp3_; _data_->connection = _data_->_tmp4_; _data_->_tmp5_ = _data_->connection; - g_dbus_connection_add_filter (_data_->_tmp5_, ___lambda4__gd_bus_message_filter_function, block1_data_ref (_data_->_data1_), block1_data_unref); + g_dbus_connection_add_filter (_data_->_tmp5_, __vala_lambda0__gd_bus_message_filter_function, block1_data_ref (_data_->_data1_), block1_data_unref); _data_->_tmp6_ = _data_->test; _data_->_tmp7_ = 0; _data_->_state_ = 2; diff --git a/tests/dbus/bug783002_server.c-expected b/tests/dbus/bug783002_server.c-expected index 988e907e6..7bd119b91 100644 --- a/tests/dbus/bug783002_server.c-expected +++ b/tests/dbus/bug783002_server.c-expected @@ -115,8 +115,8 @@ VALA_EXTERN gchar* test_test_array_lifetime_finish (Test* self, static gboolean test_test_array_lifetime_co (TestTestArrayLifetimeData* _data_); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); VALA_EXTERN Test* test_new (void); VALA_EXTERN Test* test_construct (GType object_type); static GType test_get_type_once (void); @@ -248,7 +248,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Test* self; gboolean result; @@ -259,10 +259,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; } @@ -282,7 +282,7 @@ test_test_array_lifetime_co (TestTestArrayLifetimeData* _data_) _data_->_data1_->_ref_count_ = 1; _data_->_data1_->self = g_object_ref (_data_->self); _data_->_data1_->_async_data_ = _data_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda4__gsource_func, block1_data_ref (_data_->_data1_), block1_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __vala_lambda0__gsource_func, block1_data_ref (_data_->_data1_), block1_data_unref); _data_->_state_ = 1; return FALSE; _state_1: diff --git a/tests/dbus/no-reply_client.c-expected b/tests/dbus/no-reply_client.c-expected index 1e5800578..cc09434a7 100644 --- a/tests/dbus/no-reply_client.c-expected +++ b/tests/dbus/no-reply_client.c-expected @@ -186,14 +186,14 @@ static void run_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void _g_free0_ (gpointer var); -static GDBusMessage* __lambda4_ (Block1Data* _data1_, - GDBusConnection* conn, - GDBusMessage* message, - gboolean incoming); -static GDBusMessage* ___lambda4__gd_bus_message_filter_function (GDBusConnection* connection, - GDBusMessage* message, - gboolean incoming, - gpointer self); +static GDBusMessage* _vala_lambda0_ (Block1Data* _data1_, + GDBusConnection* conn, + GDBusMessage* message, + gboolean incoming); +static GDBusMessage* __vala_lambda0__gd_bus_message_filter_function (GDBusConnection* connection, + GDBusMessage* message, + gboolean incoming, + gpointer self); static void _vala_main (void); static void _vala_array_destroy (gpointer array, gssize array_length, @@ -674,10 +674,10 @@ _g_object_ref0 (gpointer self) } static GDBusMessage* -__lambda4_ (Block1Data* _data1_, - GDBusConnection* conn, - GDBusMessage* message, - gboolean incoming) +_vala_lambda0_ (Block1Data* _data1_, + GDBusConnection* conn, + GDBusMessage* message, + gboolean incoming) { gboolean _tmp0_ = FALSE; const gchar* _tmp1_; @@ -715,13 +715,13 @@ __lambda4_ (Block1Data* _data1_, } static GDBusMessage* -___lambda4__gd_bus_message_filter_function (GDBusConnection* connection, - GDBusMessage* message, - gboolean incoming, - gpointer self) +__vala_lambda0__gd_bus_message_filter_function (GDBusConnection* connection, + GDBusMessage* message, + gboolean incoming, + gpointer self) { GDBusMessage* result; - result = __lambda4_ (self, connection, message, incoming); + result = _vala_lambda0_ (self, connection, message, incoming); return result; } @@ -761,7 +761,7 @@ run_co (RunData* _data_) _data_->_tmp4_ = _data_->_tmp3_; _data_->connection = _data_->_tmp4_; _data_->_tmp5_ = _data_->connection; - g_dbus_connection_add_filter (_data_->_tmp5_, ___lambda4__gd_bus_message_filter_function, block1_data_ref (_data_->_data1_), block1_data_unref); + g_dbus_connection_add_filter (_data_->_tmp5_, __vala_lambda0__gd_bus_message_filter_function, block1_data_ref (_data_->_data1_), block1_data_unref); _data_->_tmp6_ = _data_->test; _data_->_tmp7_ = 0; _data_->_tmp8_ = test_list_messages (_data_->_tmp6_, &_data_->_tmp7_, &_data_->_inner_error0_); diff --git a/tests/dbus/rawvariants_client.c-expected b/tests/dbus/rawvariants_client.c-expected index f5c05890e..5727a168e 100644 --- a/tests/dbus/rawvariants_client.c-expected +++ b/tests/dbus/rawvariants_client.c-expected @@ -212,12 +212,12 @@ static void _test_raw_unregister_object (gpointer user_data); VALA_EXTERN void test_raw (TestRaw* test); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_, - GVariant* var_i); +static void _vala_lambda0_ (Block1Data* _data1_, + GVariant* var_i); static gint _variant_get1 (GVariant* value); -static void ___lambda4__test_raw_test_signal (TestRaw* _sender, - GVariant* i, - gpointer self); +static void __vala_lambda0__test_raw_test_signal (TestRaw* _sender, + GVariant* i, + gpointer self); static GVariant* _variant_new1 (gint value); static GVariant* _variant_new2 (gint value); static gint _variant_get2 (GVariant* value); @@ -226,11 +226,11 @@ static gchar* _variant_get3 (GVariant* value); VALA_EXTERN void test (Test* test); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static void __lambda5_ (Block2Data* _data2_, - gint i); -static void ___lambda5__test_test_signal (Test* _sender, - gint i, - gpointer self); +static void _vala_lambda1_ (Block2Data* _data2_, + gint i); +static void __vala_lambda1__test_test_signal (Test* _sender, + gint i, + gpointer self); static void _vala_main (void); static const GDBusArgInfo _test_dbus_arg_info_test_method_j = {-1, "j", "i", NULL}; @@ -1026,8 +1026,8 @@ _variant_get1 (GVariant* value) } static void -__lambda4_ (Block1Data* _data1_, - GVariant* var_i) +_vala_lambda0_ (Block1Data* _data1_, + GVariant* var_i) { gint i = 0; gint _tmp0_; @@ -1039,11 +1039,11 @@ __lambda4_ (Block1Data* _data1_, } static void -___lambda4__test_raw_test_signal (TestRaw* _sender, - GVariant* i, - gpointer self) +__vala_lambda0__test_raw_test_signal (TestRaw* _sender, + GVariant* i, + gpointer self) { - __lambda4_ (self, i); + _vala_lambda0_ (self, i); } static GVariant* @@ -1104,7 +1104,7 @@ test_raw (TestRaw* test) _data1_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data1_->main_loop = _tmp0_; - _tmp1_ = g_signal_connect_data (test, "test-signal", (GCallback) ___lambda4__test_raw_test_signal, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); + _tmp1_ = g_signal_connect_data (test, "test-signal", (GCallback) __vala_lambda0__test_raw_test_signal, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); id = _tmp1_; _tmp3_ = _variant_new1 (23); _tmp4_ = _variant_new2 (11); @@ -1162,19 +1162,19 @@ block2_data_unref (void * _userdata_) } static void -__lambda5_ (Block2Data* _data2_, - gint i) +_vala_lambda1_ (Block2Data* _data2_, + gint i) { _vala_assert (i == 46, "i == 46"); g_main_loop_quit (_data2_->main_loop); } static void -___lambda5__test_test_signal (Test* _sender, - gint i, - gpointer self) +__vala_lambda1__test_test_signal (Test* _sender, + gint i, + gpointer self) { - __lambda5_ (self, i); + _vala_lambda1_ (self, i); } void @@ -1195,7 +1195,7 @@ test (Test* test) _data2_->_ref_count_ = 1; _tmp0_ = g_main_loop_new (NULL, FALSE); _data2_->main_loop = _tmp0_; - _tmp1_ = g_signal_connect_data (test, "test-signal", (GCallback) ___lambda5__test_test_signal, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); + _tmp1_ = g_signal_connect_data (test, "test-signal", (GCallback) __vala_lambda1__test_test_signal, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); id = _tmp1_; j = test_test_method (test, 23, 11, &_inner_error0_); if (G_UNLIKELY (_inner_error0_ != NULL)) { diff --git a/tests/dbus/signals_client.c-expected b/tests/dbus/signals_client.c-expected index 7f6db1a08..e12f0a103 100644 --- a/tests/dbus/signals_client.c-expected +++ b/tests/dbus/signals_client.c-expected @@ -126,19 +126,19 @@ static void _dbus_test_bar (GObject* _sender, gpointer* _data); static void _test_unregister_object (gpointer user_data); static void _vala_main (void); -static void __lambda4_ (gint i); -static void ___lambda4__test_foo (Test* _sender, - gint i, - gpointer self); -static void __lambda5_ (gchar** baz, - gint baz_length1); -static void ___lambda5__test_bar (Test* _sender, - gchar** baz, - gint baz_length1, - gpointer self); -static void __lambda6_ (void); -static void ___lambda6__test_finish (Test* _sender, - gpointer self); +static void _vala_lambda0_ (gint i); +static void __vala_lambda0__test_foo (Test* _sender, + gint i, + gpointer self); +static void _vala_lambda1_ (gchar** baz, + gint baz_length1); +static void __vala_lambda1__test_bar (Test* _sender, + gchar** baz, + gint baz_length1, + gpointer self); +static void _vala_lambda2_ (void); +static void __vala_lambda2__test_finish (Test* _sender, + gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -625,22 +625,22 @@ _test_unregister_object (gpointer user_data) } static void -__lambda4_ (gint i) +_vala_lambda0_ (gint i) { _vala_assert (i == 42, "i == 42"); } static void -___lambda4__test_foo (Test* _sender, - gint i, - gpointer self) +__vala_lambda0__test_foo (Test* _sender, + gint i, + gpointer self) { - __lambda4_ (i); + _vala_lambda0_ (i); } static void -__lambda5_ (gchar** baz, - gint baz_length1) +_vala_lambda1_ (gchar** baz, + gint baz_length1) { const gchar* _tmp0_; const gchar* _tmp1_; @@ -658,25 +658,25 @@ __lambda5_ (gchar** baz, } static void -___lambda5__test_bar (Test* _sender, - gchar** baz, - gint baz_length1, - gpointer self) +__vala_lambda1__test_bar (Test* _sender, + gchar** baz, + gint baz_length1, + gpointer self) { - __lambda5_ (baz, baz_length1); + _vala_lambda1_ (baz, baz_length1); } static void -__lambda6_ (void) +_vala_lambda2_ (void) { g_assert_not_reached (); } static void -___lambda6__test_finish (Test* _sender, - gpointer self) +__vala_lambda2__test_finish (Test* _sender, + gpointer self) { - __lambda6_ (); + _vala_lambda2_ (); } static void @@ -706,11 +706,11 @@ _vala_main (void) return; } _tmp1_ = test; - g_signal_connect (_tmp1_, "foo", (GCallback) ___lambda4__test_foo, NULL); + g_signal_connect (_tmp1_, "foo", (GCallback) __vala_lambda0__test_foo, NULL); _tmp2_ = test; - g_signal_connect (_tmp2_, "bar", (GCallback) ___lambda5__test_bar, NULL); + g_signal_connect (_tmp2_, "bar", (GCallback) __vala_lambda1__test_bar, NULL); _tmp3_ = test; - g_signal_connect (_tmp3_, "finish", (GCallback) ___lambda6__test_finish, NULL); + g_signal_connect (_tmp3_, "finish", (GCallback) __vala_lambda2__test_finish, NULL); _tmp4_ = test; test_do_foo (_tmp4_, 42, &_inner_error0_); if (G_UNLIKELY (_inner_error0_ != NULL)) { diff --git a/tests/delegates/bug639751.c-expected b/tests/delegates/bug639751.c-expected index 821b10481..5059c9ae6 100644 --- a/tests/delegates/bug639751.c-expected +++ b/tests/delegates/bug639751.c-expected @@ -35,8 +35,8 @@ VALA_EXTERN void foo_free (Foo* self); static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); Foo* foo_dup (const Foo* self) @@ -91,7 +91,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gboolean result; _data1_->foo.bar = NULL; @@ -101,10 +101,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; } @@ -120,7 +120,7 @@ _vala_main (void) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; memset (&_data1_->foo, 0, sizeof (Foo)); - _data1_->foo.bar = ___lambda4__gsource_func; + _data1_->foo.bar = __vala_lambda0__gsource_func; _data1_->foo.bar_target = _data1_; _tmp0_ = _data1_->foo; baz = _tmp0_; diff --git a/tests/delegates/bug659778.c-expected b/tests/delegates/bug659778.c-expected index 8bf706683..95cde78ec 100644 --- a/tests/delegates/bug659778.c-expected +++ b/tests/delegates/bug659778.c-expected @@ -66,18 +66,18 @@ VALA_EXTERN void do_something (GType g_type, gpointer f_target); VALA_EXTERN GType test_enum_get_type (void) G_GNUC_CONST ; VALA_EXTERN void test_enum_f (TestEnum self); -static TestEnum __lambda4_ (TestEnum self, - TestEnum x); -static gpointer ___lambda4__do_something (gconstpointer g, - gpointer self); +static TestEnum _vala_lambda0_ (TestEnum self, + TestEnum x); +static gpointer __vala_lambda0__do_something (gconstpointer g, + gpointer self); VALA_EXTERN void test_enum_g (TestEnum self, gint i); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static TestEnum __lambda5_ (Block1Data* _data1_, - TestEnum x); -static gpointer ___lambda5__do_something (gconstpointer g, - gpointer self); +static TestEnum _vala_lambda1_ (Block1Data* _data1_, + TestEnum x); +static gpointer __vala_lambda1__do_something (gconstpointer g, + gpointer self); VALA_EXTERN gpointer test_ref (gpointer instance); VALA_EXTERN void test_unref (gpointer instance); VALA_EXTERN GParamSpec* param_spec_test (const gchar* name, @@ -117,8 +117,8 @@ do_something (GType g_type, } static TestEnum -__lambda4_ (TestEnum self, - TestEnum x) +_vala_lambda0_ (TestEnum self, + TestEnum x) { TestEnum result; switch (self) { @@ -135,18 +135,18 @@ __lambda4_ (TestEnum self, } static gpointer -___lambda4__do_something (gconstpointer g, - gpointer self) +__vala_lambda0__do_something (gconstpointer g, + gpointer self) { gpointer result; - result = (gpointer) ((gintptr) __lambda4_ ((TestEnum) ((gintptr) self), (TestEnum) ((gintptr) g))); + result = (gpointer) ((gintptr) _vala_lambda0_ ((TestEnum) ((gintptr) self), (TestEnum) ((gintptr) g))); return result; } void test_enum_f (TestEnum self) { - do_something (TYPE_TEST_ENUM, NULL, NULL, ___lambda4__do_something, (gpointer) ((gintptr) self)); + do_something (TYPE_TEST_ENUM, NULL, NULL, __vala_lambda0__do_something, (gpointer) ((gintptr) self)); } static Block1Data* @@ -169,8 +169,8 @@ block1_data_unref (void * _userdata_) } static TestEnum -__lambda5_ (Block1Data* _data1_, - TestEnum x) +_vala_lambda1_ (Block1Data* _data1_, + TestEnum x) { TestEnum self; TestEnum result; @@ -192,11 +192,11 @@ __lambda5_ (Block1Data* _data1_, } static gpointer -___lambda5__do_something (gconstpointer g, - gpointer self) +__vala_lambda1__do_something (gconstpointer g, + gpointer self) { gpointer result; - result = (gpointer) ((gintptr) __lambda5_ (self, (TestEnum) ((gintptr) g))); + result = (gpointer) ((gintptr) _vala_lambda1_ (self, (TestEnum) ((gintptr) g))); return result; } @@ -209,7 +209,7 @@ test_enum_g (TestEnum self, _data1_->_ref_count_ = 1; _data1_->self = (self); _data1_->i = i; - do_something (TYPE_TEST_ENUM, NULL, NULL, ___lambda5__do_something, _data1_); + do_something (TYPE_TEST_ENUM, NULL, NULL, __vala_lambda1__do_something, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/delegates/bug703804.c-expected b/tests/delegates/bug703804.c-expected index eace5c171..f65d2c0d6 100644 --- a/tests/delegates/bug703804.c-expected +++ b/tests/delegates/bug703804.c-expected @@ -30,8 +30,8 @@ VALA_EXTERN void eval (Run run, 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__run (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__run (gpointer self); void eval (Run run, @@ -68,7 +68,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gint _tmp0_; _tmp0_ = _data1_->i; @@ -76,9 +76,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__run (gpointer self) +__vala_lambda0__run (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); block1_data_unref (self); } @@ -89,7 +89,7 @@ _vala_main (void) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->i = 0; - eval (___lambda4__run, block1_data_ref (_data1_)); + eval (__vala_lambda0__run, block1_data_ref (_data1_)); _vala_assert (_data1_->i == 1, "i == 1"); block1_data_unref (_data1_); _data1_ = NULL; diff --git a/tests/delegates/bug761360.c-expected b/tests/delegates/bug761360.c-expected index f180a86d7..e26dcf03d 100644 --- a/tests/delegates/bug761360.c-expected +++ b/tests/delegates/bug761360.c-expected @@ -10,12 +10,12 @@ typedef gint* (*ArrayReturnFunc) (gint* result_length1, gpointer user_data); #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); static void _vala_main (void); -static gint* __lambda4_ (gint* result_length1); -static gint* ___lambda4__array_return_func (gint* result_length1, - gpointer self); +static gint* _vala_lambda0_ (gint* result_length1); +static gint* __vala_lambda0__array_return_func (gint* result_length1, + gpointer self); static gint* -__lambda4_ (gint* result_length1) +_vala_lambda0_ (gint* result_length1) { gint* _tmp0_; gint* _tmp1_; @@ -35,11 +35,11 @@ __lambda4_ (gint* result_length1) } static gint* -___lambda4__array_return_func (gint* result_length1, - gpointer self) +__vala_lambda0__array_return_func (gint* result_length1, + gpointer self) { gint* result; - result = __lambda4_ (result_length1); + result = _vala_lambda0_ (result_length1); return result; } @@ -54,7 +54,7 @@ _vala_main (void) gint* _tmp1_; gint a_length1; gint _a_size_; - f = ___lambda4__array_return_func; + f = __vala_lambda0__array_return_func; f_target = NULL; f_target_destroy_notify = NULL; _tmp1_ = f (&_tmp0_, f_target); diff --git a/tests/delegates/bug792077.c-expected b/tests/delegates/bug792077.c-expected index 1839c4ddf..ea714330b 100644 --- a/tests/delegates/bug792077.c-expected +++ b/tests/delegates/bug792077.c-expected @@ -24,37 +24,37 @@ VALA_EXTERN gint result; gint result = 0; static void _vala_main (void); -static FooFunc __lambda4_ (gpointer* result_target, - GDestroyNotify* result_target_destroy_notify); -static void __lambda5_ (gint data); -static void ___lambda5__foo_func (gint i, - gpointer self); -static FooFunc ___lambda4__bar_func (gpointer* result_target, - GDestroyNotify* result_target_destroy_notify, - gpointer self); +static FooFunc _vala_lambda0_ (gpointer* result_target, + GDestroyNotify* result_target_destroy_notify); +static void _vala_lambda1_ (gint data); +static void __vala_lambda1__foo_func (gint i, + gpointer self); +static FooFunc __vala_lambda0__bar_func (gpointer* result_target, + GDestroyNotify* result_target_destroy_notify, + gpointer self); static void -__lambda5_ (gint data) +_vala_lambda1_ (gint data) { result = data; } static void -___lambda5__foo_func (gint i, - gpointer self) +__vala_lambda1__foo_func (gint i, + gpointer self) { - __lambda5_ (i); + _vala_lambda1_ (i); } static FooFunc -__lambda4_ (gpointer* result_target, - GDestroyNotify* result_target_destroy_notify) +_vala_lambda0_ (gpointer* result_target, + GDestroyNotify* result_target_destroy_notify) { FooFunc _tmp0_; gpointer _tmp0__target; GDestroyNotify _tmp0__target_destroy_notify; FooFunc result; - _tmp0_ = ___lambda5__foo_func; + _tmp0_ = __vala_lambda1__foo_func; _tmp0__target = NULL; _tmp0__target_destroy_notify = NULL; *result_target = _tmp0__target; @@ -64,12 +64,12 @@ __lambda4_ (gpointer* result_target, } static FooFunc -___lambda4__bar_func (gpointer* result_target, - GDestroyNotify* result_target_destroy_notify, - gpointer self) +__vala_lambda0__bar_func (gpointer* result_target, + GDestroyNotify* result_target_destroy_notify, + gpointer self) { FooFunc result; - result = __lambda4_ (result_target, result_target_destroy_notify); + result = _vala_lambda0_ (result_target, result_target_destroy_notify); return result; } @@ -85,7 +85,7 @@ _vala_main (void) FooFunc _tmp2_; gpointer func_target; GDestroyNotify func_target_destroy_notify; - func_gen = ___lambda4__bar_func; + func_gen = __vala_lambda0__bar_func; func_gen_target = NULL; func_gen_target_destroy_notify = NULL; _tmp2_ = func_gen (&_tmp0_, &_tmp1_, func_gen_target); diff --git a/tests/delegates/class-field-initializer.c-expected b/tests/delegates/class-field-initializer.c-expected index f981813f1..6243b3092 100644 --- a/tests/delegates/class-field-initializer.c-expected +++ b/tests/delegates/class-field-initializer.c-expected @@ -75,8 +75,8 @@ VALA_EXTERN FooFunc get_func (gpointer* result_target, GDestroyNotify* result_target_destroy_notify); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gchar* __lambda4_ (Block1Data* _data1_); -static gchar* ___lambda4__foo_func (gpointer self); +static gchar* _vala_lambda0_ (Block1Data* _data1_); +static gchar* __vala_lambda0__foo_func (gpointer self); VALA_EXTERN gpointer foo_ref (gpointer instance); VALA_EXTERN void foo_unref (gpointer instance); VALA_EXTERN GParamSpec* param_spec_foo (const gchar* name, @@ -120,7 +120,7 @@ block1_data_unref (void * _userdata_) } static gchar* -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gchar* _tmp0_; gchar* result; @@ -130,10 +130,10 @@ __lambda4_ (Block1Data* _data1_) } static gchar* -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { gchar* result; - result = __lambda4_ (self); + result = _vala_lambda0_ (self); return result; } @@ -151,7 +151,7 @@ get_func (gpointer* result_target, _data1_->_ref_count_ = 1; _tmp0_ = g_strdup ("foo"); _data1_->s = _tmp0_; - _tmp1_ = ___lambda4__foo_func; + _tmp1_ = __vala_lambda0__foo_func; _tmp1__target = block1_data_ref (_data1_); _tmp1__target_destroy_notify = block1_data_unref; *result_target = _tmp1__target; diff --git a/tests/delegates/delegates.c-expected b/tests/delegates/delegates.c-expected index 1ee17151c..11dbaae17 100644 --- a/tests/delegates/delegates.c-expected +++ b/tests/delegates/delegates.c-expected @@ -122,8 +122,8 @@ static void maman_bar_real_foo_method (MamanFoo* base, static void maman_bar_test_delegates_interface_method (void); static void maman_bar_test_field_reference_transfer (MamanBar* self); static MamanVoidCallback maman_bar_test_unowned_delegate_return (void); -static void __lambda4_ (void); -static void ___lambda4__maman_void_callback (void); +static void _vala_lambda0_ (void); +static void __vala_lambda0__maman_void_callback (void); static gint maman_bar_main (void); static gint _maman_bar_do_action_maman_action_callback (void); static void _maman_bar_do_instance_action_maman_instance_callback (gint i, @@ -422,21 +422,21 @@ maman_bar_test_field_reference_transfer (MamanBar* self) } static void -__lambda4_ (void) +_vala_lambda0_ (void) { } static void -___lambda4__maman_void_callback (void) +__vala_lambda0__maman_void_callback (void) { - __lambda4_ (); + _vala_lambda0_ (); } static MamanVoidCallback maman_bar_test_unowned_delegate_return (void) { MamanVoidCallback result; - result = ___lambda4__maman_void_callback; + result = __vala_lambda0__maman_void_callback; return result; } diff --git a/tests/delegates/implicit-local-variable.c-expected b/tests/delegates/implicit-local-variable.c-expected index 489221096..a05d620de 100644 --- a/tests/delegates/implicit-local-variable.c-expected +++ b/tests/delegates/implicit-local-variable.c-expected @@ -7,13 +7,13 @@ typedef gboolean (*GSourceDispatchFunc) (GSource* source, GSourceFunc _callback, #define _g_source_unref0(var) ((var == NULL) ? NULL : (var = (g_source_unref (var), NULL))) static void _vala_main (void); -static gboolean __lambda4_ (void); -static gboolean ___lambda4__gsource_dispatch_func (GSource* source, - GSourceFunc _callback, - gpointer _callback_target); +static gboolean _vala_lambda0_ (void); +static gboolean __vala_lambda0__gsource_dispatch_func (GSource* source, + GSourceFunc _callback, + gpointer _callback_target); static gboolean -__lambda4_ (void) +_vala_lambda0_ (void) { gboolean result; result = FALSE; @@ -21,12 +21,12 @@ __lambda4_ (void) } static gboolean -___lambda4__gsource_dispatch_func (GSource* source, - GSourceFunc _callback, - gpointer _callback_target) +__vala_lambda0__gsource_dispatch_func (GSource* source, + GSourceFunc _callback, + gpointer _callback_target) { gboolean result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } @@ -40,7 +40,7 @@ _vala_main (void) GSourceDispatchFunc _tmp2_; _tmp0_.prepare = NULL; _tmp0_.check = NULL; - _tmp0_.dispatch = ___lambda4__gsource_dispatch_func; + _tmp0_.dispatch = __vala_lambda0__gsource_dispatch_func; _tmp0_.finalize = NULL; foo = _tmp0_; bar = NULL; diff --git a/tests/delegates/lambda-mixed-instance-static.c-expected b/tests/delegates/lambda-mixed-instance-static.c-expected index 9935bc4be..d3581323b 100644 --- a/tests/delegates/lambda-mixed-instance-static.c-expected +++ b/tests/delegates/lambda-mixed-instance-static.c-expected @@ -32,12 +32,12 @@ VALA_EXTERN void func (FooFunc f, static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gint __lambda4_ (gint i); -static gint ___lambda4__foo_func (gint i); -static gint __lambda5_ (Block1Data* _data1_, - gint i); -static gint ___lambda5__bar_func (gint i, - gpointer self); +static gint _vala_lambda0_ (gint i); +static gint __vala_lambda0__foo_func (gint i); +static gint _vala_lambda1_ (Block1Data* _data1_, + gint i); +static gint __vala_lambda1__bar_func (gint i, + gpointer self); void func (FooFunc f, @@ -66,7 +66,7 @@ block1_data_unref (void * _userdata_) } static gint -__lambda4_ (gint i) +_vala_lambda0_ (gint i) { gint result; _vala_assert (i == 42, "i == 42"); @@ -75,16 +75,16 @@ __lambda4_ (gint i) } static gint -___lambda4__foo_func (gint i) +__vala_lambda0__foo_func (gint i) { gint result; - result = __lambda4_ (i); + result = _vala_lambda0_ (i); return result; } static gint -__lambda5_ (Block1Data* _data1_, - gint i) +_vala_lambda1_ (Block1Data* _data1_, + gint i) { gint result; _vala_assert (i == 23, "i == 23"); @@ -93,11 +93,11 @@ __lambda5_ (Block1Data* _data1_, } static gint -___lambda5__bar_func (gint i, - gpointer self) +__vala_lambda1__bar_func (gint i, + gpointer self) { gint result; - result = __lambda5_ (self, i); + result = _vala_lambda1_ (self, i); return result; } @@ -108,7 +108,7 @@ _vala_main (void) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->global = 4711; - func (___lambda4__foo_func, ___lambda5__bar_func, _data1_); + func (__vala_lambda0__foo_func, __vala_lambda1__bar_func, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/delegates/lambda-shared-closure.c-expected b/tests/delegates/lambda-shared-closure.c-expected index ee374e9c8..457ef906f 100644 --- a/tests/delegates/lambda-shared-closure.c-expected +++ b/tests/delegates/lambda-shared-closure.c-expected @@ -131,31 +131,31 @@ static void foo_call_shared_owned (Foo* self, VALA_EXTERN void foo_run_1 (Foo* self); 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 __lambda5_ (Block1Data* _data1_); -static void ___lambda5__foo_func (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__foo_func (gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_); +static void __vala_lambda1__foo_func (gpointer self); VALA_EXTERN void foo_run_2 (Foo* self); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static void __lambda6_ (Block2Data* _data2_); -static void ___lambda6__foo_func (gpointer self); -static void __lambda7_ (Block2Data* _data2_); -static void ___lambda7__foo_func (gpointer self); +static void _vala_lambda2_ (Block2Data* _data2_); +static void __vala_lambda2__foo_func (gpointer self); +static void _vala_lambda3_ (Block2Data* _data2_); +static void __vala_lambda3__foo_func (gpointer self); VALA_EXTERN void foo_run_3 (Foo* self); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static void __lambda8_ (Block3Data* _data3_); -static void ___lambda8__foo_func (gpointer self); -static void __lambda9_ (Block3Data* _data3_); -static void ___lambda9__foo_func (gpointer self); +static void _vala_lambda4_ (Block3Data* _data3_); +static void __vala_lambda4__foo_func (gpointer self); +static void _vala_lambda5_ (Block3Data* _data3_); +static void __vala_lambda5__foo_func (gpointer self); VALA_EXTERN void foo_run_4 (Foo* self); static Block4Data* block4_data_ref (Block4Data* _data4_); static void block4_data_unref (void * _userdata_); -static void __lambda10_ (Block4Data* _data4_); -static void ___lambda10__foo_func (gpointer self); -static void __lambda11_ (Block4Data* _data4_); -static void ___lambda11__foo_func (gpointer self); +static void _vala_lambda6_ (Block4Data* _data4_); +static void __vala_lambda6__foo_func (gpointer self); +static void _vala_lambda7_ (Block4Data* _data4_); +static void __vala_lambda7__foo_func (gpointer self); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static void foo_finalize (GObject * obj); @@ -170,31 +170,31 @@ VALA_EXTERN void call_shared_owned (FooFunc a, VALA_EXTERN void run_static_1 (void); static Block5Data* block5_data_ref (Block5Data* _data5_); static void block5_data_unref (void * _userdata_); -static void __lambda12_ (Block5Data* _data5_); -static void ___lambda12__foo_func (gpointer self); -static void __lambda13_ (void); -static void ___lambda13__foo_func (gpointer self); +static void _vala_lambda8_ (Block5Data* _data5_); +static void __vala_lambda8__foo_func (gpointer self); +static void _vala_lambda9_ (void); +static void __vala_lambda9__foo_func (gpointer self); VALA_EXTERN void run_static_2 (void); static Block6Data* block6_data_ref (Block6Data* _data6_); static void block6_data_unref (void * _userdata_); -static void __lambda14_ (void); -static void ___lambda14__foo_func (gpointer self); -static void __lambda15_ (Block6Data* _data6_); -static void ___lambda15__foo_func (gpointer self); +static void _vala_lambda10_ (void); +static void __vala_lambda10__foo_func (gpointer self); +static void _vala_lambda11_ (Block6Data* _data6_); +static void __vala_lambda11__foo_func (gpointer self); VALA_EXTERN void run_static_3 (void); static Block7Data* block7_data_ref (Block7Data* _data7_); static void block7_data_unref (void * _userdata_); -static void __lambda16_ (Block7Data* _data7_); -static void ___lambda16__foo_func (gpointer self); -static void __lambda17_ (void); -static void ___lambda17__foo_func (gpointer self); +static void _vala_lambda12_ (Block7Data* _data7_); +static void __vala_lambda12__foo_func (gpointer self); +static void _vala_lambda13_ (void); +static void __vala_lambda13__foo_func (gpointer self); VALA_EXTERN void run_static_4 (void); static Block8Data* block8_data_ref (Block8Data* _data8_); static void block8_data_unref (void * _userdata_); -static void __lambda18_ (void); -static void ___lambda18__foo_func (gpointer self); -static void __lambda19_ (Block8Data* _data8_); -static void ___lambda19__foo_func (gpointer self); +static void _vala_lambda14_ (void); +static void __vala_lambda14__foo_func (gpointer self); +static void _vala_lambda15_ (Block8Data* _data8_); +static void __vala_lambda15__foo_func (gpointer self); static void _vala_main (void); static inline gpointer @@ -289,7 +289,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; self = _data1_->self; @@ -298,13 +298,13 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void -__lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { Foo* self; self = _data1_->self; @@ -313,9 +313,9 @@ __lambda5_ (Block1Data* _data1_) } static void -___lambda5__foo_func (gpointer self) +__vala_lambda1__foo_func (gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); } void @@ -328,7 +328,7 @@ foo_run_1 (Foo* self) _data1_->self = g_object_ref (self); _data1_->local = 23; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); - foo_call (self, ___lambda4__foo_func, _data1_, ___lambda5__foo_func, _data1_); + foo_call (self, __vala_lambda0__foo_func, _data1_, __vala_lambda1__foo_func, _data1_); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); block1_data_unref (_data1_); _data1_ = NULL; @@ -355,7 +355,7 @@ block2_data_unref (void * _userdata_) } static void -__lambda6_ (Block2Data* _data2_) +_vala_lambda2_ (Block2Data* _data2_) { Foo* self; self = _data2_->self; @@ -363,13 +363,13 @@ __lambda6_ (Block2Data* _data2_) } static void -___lambda6__foo_func (gpointer self) +__vala_lambda2__foo_func (gpointer self) { - __lambda6_ (self); + _vala_lambda2_ (self); } static void -__lambda7_ (Block2Data* _data2_) +_vala_lambda3_ (Block2Data* _data2_) { Foo* self; self = _data2_->self; @@ -377,9 +377,9 @@ __lambda7_ (Block2Data* _data2_) } static void -___lambda7__foo_func (gpointer self) +__vala_lambda3__foo_func (gpointer self) { - __lambda7_ (self); + _vala_lambda3_ (self); } void @@ -392,7 +392,7 @@ foo_run_2 (Foo* self) _data2_->self = g_object_ref (self); _data2_->local = 23; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); - foo_call_owned (self, ___lambda6__foo_func, block2_data_ref (_data2_), block2_data_unref, ___lambda7__foo_func, block2_data_ref (_data2_), block2_data_unref); + foo_call_owned (self, __vala_lambda2__foo_func, block2_data_ref (_data2_), block2_data_unref, __vala_lambda3__foo_func, block2_data_ref (_data2_), block2_data_unref); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); block2_data_unref (_data2_); _data2_ = NULL; @@ -419,7 +419,7 @@ block3_data_unref (void * _userdata_) } static void -__lambda8_ (Block3Data* _data3_) +_vala_lambda4_ (Block3Data* _data3_) { Foo* self; self = _data3_->self; @@ -427,13 +427,13 @@ __lambda8_ (Block3Data* _data3_) } static void -___lambda8__foo_func (gpointer self) +__vala_lambda4__foo_func (gpointer self) { - __lambda8_ (self); + _vala_lambda4_ (self); } static void -__lambda9_ (Block3Data* _data3_) +_vala_lambda5_ (Block3Data* _data3_) { Foo* self; self = _data3_->self; @@ -441,9 +441,9 @@ __lambda9_ (Block3Data* _data3_) } static void -___lambda9__foo_func (gpointer self) +__vala_lambda5__foo_func (gpointer self) { - __lambda9_ (self); + _vala_lambda5_ (self); } void @@ -456,7 +456,7 @@ foo_run_3 (Foo* self) _data3_->self = g_object_ref (self); _data3_->local = 23; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); - foo_call_shared (self, ___lambda8__foo_func, ___lambda9__foo_func, _data3_); + foo_call_shared (self, __vala_lambda4__foo_func, __vala_lambda5__foo_func, _data3_); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); block3_data_unref (_data3_); _data3_ = NULL; @@ -483,7 +483,7 @@ block4_data_unref (void * _userdata_) } static void -__lambda10_ (Block4Data* _data4_) +_vala_lambda6_ (Block4Data* _data4_) { Foo* self; self = _data4_->self; @@ -491,13 +491,13 @@ __lambda10_ (Block4Data* _data4_) } static void -___lambda10__foo_func (gpointer self) +__vala_lambda6__foo_func (gpointer self) { - __lambda10_ (self); + _vala_lambda6_ (self); } static void -__lambda11_ (Block4Data* _data4_) +_vala_lambda7_ (Block4Data* _data4_) { Foo* self; self = _data4_->self; @@ -505,9 +505,9 @@ __lambda11_ (Block4Data* _data4_) } static void -___lambda11__foo_func (gpointer self) +__vala_lambda7__foo_func (gpointer self) { - __lambda11_ (self); + _vala_lambda7_ (self); } void @@ -520,7 +520,7 @@ foo_run_4 (Foo* self) _data4_->self = g_object_ref (self); _data4_->local = 23; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); - foo_call_shared_owned (self, ___lambda10__foo_func, ___lambda11__foo_func, block4_data_ref (_data4_), block4_data_unref); + foo_call_shared_owned (self, __vala_lambda6__foo_func, __vala_lambda7__foo_func, block4_data_ref (_data4_), block4_data_unref); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 2), "this.ref_count == 2"); block4_data_unref (_data4_); _data4_ = NULL; @@ -633,26 +633,26 @@ block5_data_unref (void * _userdata_) } static void -__lambda12_ (Block5Data* _data5_) +_vala_lambda8_ (Block5Data* _data5_) { _vala_assert (_data5_->foo != NULL, "foo != null"); } static void -___lambda12__foo_func (gpointer self) +__vala_lambda8__foo_func (gpointer self) { - __lambda12_ (self); + _vala_lambda8_ (self); } static void -__lambda13_ (void) +_vala_lambda9_ (void) { } static void -___lambda13__foo_func (gpointer self) +__vala_lambda9__foo_func (gpointer self) { - __lambda13_ (); + _vala_lambda9_ (); } void @@ -665,7 +665,7 @@ run_static_1 (void) _tmp0_ = foo_new (); _data5_->foo = _tmp0_; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data5_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); - call_shared (___lambda12__foo_func, ___lambda13__foo_func, _data5_); + call_shared (__vala_lambda8__foo_func, __vala_lambda9__foo_func, _data5_); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data5_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); block5_data_unref (_data5_); _data5_ = NULL; @@ -690,26 +690,26 @@ block6_data_unref (void * _userdata_) } static void -__lambda14_ (void) +_vala_lambda10_ (void) { } static void -___lambda14__foo_func (gpointer self) +__vala_lambda10__foo_func (gpointer self) { - __lambda14_ (); + _vala_lambda10_ (); } static void -__lambda15_ (Block6Data* _data6_) +_vala_lambda11_ (Block6Data* _data6_) { _vala_assert (_data6_->foo != NULL, "foo != null"); } static void -___lambda15__foo_func (gpointer self) +__vala_lambda11__foo_func (gpointer self) { - __lambda15_ (self); + _vala_lambda11_ (self); } void @@ -722,7 +722,7 @@ run_static_2 (void) _tmp0_ = foo_new (); _data6_->foo = _tmp0_; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data6_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); - call_shared (___lambda14__foo_func, ___lambda15__foo_func, _data6_); + call_shared (__vala_lambda10__foo_func, __vala_lambda11__foo_func, _data6_); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data6_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); block6_data_unref (_data6_); _data6_ = NULL; @@ -747,26 +747,26 @@ block7_data_unref (void * _userdata_) } static void -__lambda16_ (Block7Data* _data7_) +_vala_lambda12_ (Block7Data* _data7_) { _vala_assert (_data7_->foo != NULL, "foo != null"); } static void -___lambda16__foo_func (gpointer self) +__vala_lambda12__foo_func (gpointer self) { - __lambda16_ (self); + _vala_lambda12_ (self); } static void -__lambda17_ (void) +_vala_lambda13_ (void) { } static void -___lambda17__foo_func (gpointer self) +__vala_lambda13__foo_func (gpointer self) { - __lambda17_ (); + _vala_lambda13_ (); } void @@ -779,7 +779,7 @@ run_static_3 (void) _tmp0_ = foo_new (); _data7_->foo = _tmp0_; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data7_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); - call_shared_owned (___lambda16__foo_func, ___lambda17__foo_func, block7_data_ref (_data7_), block7_data_unref); + call_shared_owned (__vala_lambda12__foo_func, __vala_lambda13__foo_func, block7_data_ref (_data7_), block7_data_unref); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data7_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); block7_data_unref (_data7_); _data7_ = NULL; @@ -804,26 +804,26 @@ block8_data_unref (void * _userdata_) } static void -__lambda18_ (void) +_vala_lambda14_ (void) { } static void -___lambda18__foo_func (gpointer self) +__vala_lambda14__foo_func (gpointer self) { - __lambda18_ (); + _vala_lambda14_ (); } static void -__lambda19_ (Block8Data* _data8_) +_vala_lambda15_ (Block8Data* _data8_) { _vala_assert (_data8_->foo != NULL, "foo != null"); } static void -___lambda19__foo_func (gpointer self) +__vala_lambda15__foo_func (gpointer self) { - __lambda19_ (self); + _vala_lambda15_ (self); } void @@ -836,7 +836,7 @@ run_static_4 (void) _tmp0_ = foo_new (); _data8_->foo = _tmp0_; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data8_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); - call_shared_owned (___lambda18__foo_func, ___lambda19__foo_func, block8_data_ref (_data8_), block8_data_unref); + call_shared_owned (__vala_lambda14__foo_func, __vala_lambda15__foo_func, block8_data_ref (_data8_), block8_data_unref); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (_data8_->foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); block8_data_unref (_data8_); _data8_ = NULL; diff --git a/tests/delegates/reference_transfer.c-expected b/tests/delegates/reference_transfer.c-expected index 6eda31992..ff638b21e 100644 --- a/tests/delegates/reference_transfer.c-expected +++ b/tests/delegates/reference_transfer.c-expected @@ -82,8 +82,8 @@ VALA_EXTERN Foo* foo_construct (GType object_type, static void foo_finalize (Foo * obj); static GType foo_get_type_once (void); static void _vala_main (void); -static void __lambda4_ (void); -static void ___lambda4__foo_func (gpointer self); +static void _vala_lambda0_ (void); +static void __vala_lambda0__foo_func (gpointer self); static inline gpointer foo_get_instance_private (Foo* self) @@ -338,14 +338,14 @@ foo_unref (gpointer instance) } static void -__lambda4_ (void) +_vala_lambda0_ (void) { } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ (); + _vala_lambda0_ (); } static void @@ -353,7 +353,7 @@ _vala_main (void) { Foo* foo = NULL; Foo* _tmp0_; - _tmp0_ = foo_new (___lambda4__foo_func, NULL, NULL); + _tmp0_ = foo_new (__vala_lambda0__foo_func, NULL, NULL); foo = _tmp0_; _foo_unref0 (foo); } diff --git a/tests/errors/delegate-throws-error-code.c-expected b/tests/errors/delegate-throws-error-code.c-expected index 8799e49ba..03ea9e7b5 100644 --- a/tests/errors/delegate-throws-error-code.c-expected +++ b/tests/errors/delegate-throws-error-code.c-expected @@ -26,9 +26,9 @@ typedef enum { VALA_EXTERN GQuark foo_error_quark (void); GType foo_error_get_type (void) G_GNUC_CONST ; static void _vala_main (void); -static void __lambda4_ (GError** error); -static void ___lambda4__foo_func (gpointer self, - GError** error); +static void _vala_lambda0_ (GError** error); +static void __vala_lambda0__foo_func (gpointer self, + GError** error); GQuark foo_error_quark (void) @@ -58,15 +58,15 @@ foo_error_get_type (void) } static void -__lambda4_ (GError** error) +_vala_lambda0_ (GError** error) { } static void -___lambda4__foo_func (gpointer self, - GError** error) +__vala_lambda0__foo_func (gpointer self, + GError** error) { - __lambda4_ (error); + _vala_lambda0_ (error); } static void @@ -76,7 +76,7 @@ _vala_main (void) gpointer foo_target; GDestroyNotify foo_target_destroy_notify; GError* _inner_error0_ = NULL; - foo = ___lambda4__foo_func; + foo = __vala_lambda0__foo_func; foo_target = NULL; foo_target_destroy_notify = NULL; foo (foo_target, &_inner_error0_); diff --git a/tests/generics/member-dup-destroy.c-expected b/tests/generics/member-dup-destroy.c-expected index 095a9c316..82ab13846 100644 --- a/tests/generics/member-dup-destroy.c-expected +++ b/tests/generics/member-dup-destroy.c-expected @@ -110,8 +110,8 @@ VALA_EXTERN void foo_foo_finish (Foo* self, GAsyncResult* _res_); static gboolean foo_foo_async_co (FooFooAsyncData* _data_); VALA_EXTERN void foo_foo_captured (Foo* self); -static void __lambda4_ (Foo* self); -static void ___lambda4__foo_func (gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__foo_func (gpointer self); static GType foo_get_type_once (void); static void _vala_foo_get_property (GObject * object, guint property_id, @@ -140,8 +140,8 @@ VALA_EXTERN void bar_captured (GType t_type, gconstpointer t); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda5_ (Block1Data* _data1_); -static void ___lambda5__foo_func (gpointer self); +static void _vala_lambda1_ (Block1Data* _data1_); +static void __vala_lambda1__foo_func (gpointer self); static void _vala_main (void); static inline gpointer @@ -261,7 +261,7 @@ foo_foo_async_co (FooFooAsyncData* _data_) } static void -__lambda4_ (Foo* self) +_vala_lambda0_ (Foo* self) { gpointer g = NULL; _vala_assert (self->priv->g_type == G_TYPE_STRING, "typeof (G) == typeof (string)"); @@ -274,9 +274,9 @@ __lambda4_ (Foo* self) } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ ((Foo*) self); + _vala_lambda0_ ((Foo*) self); } void @@ -286,7 +286,7 @@ foo_foo_captured (Foo* self) gpointer f_target; GDestroyNotify f_target_destroy_notify; g_return_if_fail (IS_FOO (self)); - f = ___lambda4__foo_func; + f = __vala_lambda0__foo_func; f_target = g_object_ref (self); f_target_destroy_notify = g_object_unref; f (f_target); @@ -487,7 +487,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { GType t_type; GBoxedCopyFunc t_dup_func; @@ -503,9 +503,9 @@ __lambda5_ (Block1Data* _data1_) } static void -___lambda5__foo_func (gpointer self) +__vala_lambda1__foo_func (gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); } void @@ -527,7 +527,7 @@ bar_captured (GType t_type, _tmp0_ = ((t != NULL) && (t_dup_func != NULL)) ? t_dup_func ((gpointer) t) : ((gpointer) t); ((_data1_->t == NULL) || (t_destroy_func == NULL)) ? NULL : (_data1_->t = (t_destroy_func (_data1_->t), NULL)); _data1_->t = _tmp0_; - f = ___lambda5__foo_func; + f = __vala_lambda1__foo_func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; f (f_target); diff --git a/tests/genie/function-returns-closure.c-expected b/tests/genie/function-returns-closure.c-expected index e77659a08..7d569ee87 100644 --- a/tests/genie/function-returns-closure.c-expected +++ b/tests/genie/function-returns-closure.c-expected @@ -25,8 +25,8 @@ static void _vala_main (gchar** args, gint args_length1); VALA_EXTERN TestFunction test (gpointer* result_target, GDestroyNotify* result_target_destroy_notify); -static gboolean __lambda4_ (void); -static gboolean ___lambda4__test_function (gpointer self); +static gboolean _vala_lambda0_ (void); +static gboolean __vala_lambda0__test_function (gpointer self); static void _vala_main (gchar** args, @@ -58,7 +58,7 @@ main (int argc, } static gboolean -__lambda4_ (void) +_vala_lambda0_ (void) { gboolean result; result = TRUE; @@ -66,10 +66,10 @@ __lambda4_ (void) } static gboolean -___lambda4__test_function (gpointer self) +__vala_lambda0__test_function (gpointer self) { gboolean result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } @@ -81,7 +81,7 @@ test (gpointer* result_target, gpointer _tmp0__target; GDestroyNotify _tmp0__target_destroy_notify; TestFunction result; - _tmp0_ = ___lambda4__test_function; + _tmp0_ = __vala_lambda0__test_function; _tmp0__target = NULL; _tmp0__target_destroy_notify = NULL; *result_target = _tmp0__target; diff --git a/tests/methods/array-length-type.c-expected b/tests/methods/array-length-type.c-expected index 294185b86..93ca211b0 100644 --- a/tests/methods/array-length-type.c-expected +++ b/tests/methods/array-length-type.c-expected @@ -187,15 +187,15 @@ VALA_EXTERN gint* foo_func (gint* p, static gint* _vala_array_dup4 (gint* self, gssize length); static void _vala_main (void); -static gint* ___lambda4_ (gint* a, - guint8 a_length1, - guint8* result_length1); +static gint* _vala_lambda0_ (gint* a, + guint8 a_length1, + guint8* result_length1); static gint* _vala_array_dup5 (gint* self, gssize length); -static gint* ____lambda4__foo_func (gint* p, - guint8 p_length1, - guint8* result_length1, - gpointer self); +static gint* __vala_lambda0__foo_func (gint* p, + guint8 p_length1, + guint8* result_length1, + gpointer self); static inline gpointer _vala_memdup2 (gconstpointer mem, gsize byte_size); @@ -1162,9 +1162,9 @@ _vala_array_dup5 (gint* self, } static gint* -___lambda4_ (gint* a, - guint8 a_length1, - guint8* result_length1) +_vala_lambda0_ (gint* a, + guint8 a_length1, + guint8* result_length1) { gint* _tmp0_; gint _tmp0__length1; @@ -1184,13 +1184,13 @@ ___lambda4_ (gint* a, } static gint* -____lambda4__foo_func (gint* p, - guint8 p_length1, - guint8* result_length1, - gpointer self) +__vala_lambda0__foo_func (gint* p, + guint8 p_length1, + guint8* result_length1, + gpointer self) { gint* result; - result = ___lambda4_ (p, p_length1, result_length1); + result = _vala_lambda0_ (p, p_length1, result_length1); return result; } @@ -1216,7 +1216,7 @@ _vala_main (void) gint* _tmp6_; gint _tmp6__length1; gint _tmp7_; - f = ____lambda4__foo_func; + f = __vala_lambda0__foo_func; f_target = NULL; f_target_destroy_notify = NULL; _tmp0_ = g_new0 (gint, 255); diff --git a/tests/methods/bug595538.c-expected b/tests/methods/bug595538.c-expected index a284d27d0..ccd49ec11 100644 --- a/tests/methods/bug595538.c-expected +++ b/tests/methods/bug595538.c-expected @@ -26,10 +26,10 @@ VALA_EXTERN void do_foo (Foo foo, 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 __lambda5_ (Block1Data* _data1_); -static void ___lambda5__foo (gpointer self); -static void ___lambda4__foo (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void _vala_lambda1_ (Block1Data* _data1_); +static void __vala_lambda1__foo (gpointer self); +static void __vala_lambda0__foo (gpointer self); void do_foo (Foo foo, @@ -56,28 +56,28 @@ block1_data_unref (void * _userdata_) } static void -__lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { gint j = 0; j = _data1_->i; } static void -___lambda5__foo (gpointer self) +__vala_lambda1__foo (gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { - do_foo (___lambda5__foo, _data1_); + do_foo (__vala_lambda1__foo, _data1_); } static void -___lambda4__foo (gpointer self) +__vala_lambda0__foo (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -87,7 +87,7 @@ _vala_main (void) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->i = 42; - do_foo (___lambda4__foo, _data1_); + do_foo (__vala_lambda0__foo, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/methods/bug596726.c-expected b/tests/methods/bug596726.c-expected index c49f5b33d..4f0aaa562 100644 --- a/tests/methods/bug596726.c-expected +++ b/tests/methods/bug596726.c-expected @@ -28,8 +28,8 @@ VALA_EXTERN void do_bar (Func f, VALA_EXTERN GObject* 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__func (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__func (gpointer self); static void _vala_main (void); void @@ -63,7 +63,7 @@ _g_object_ref0 (gpointer self) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { GObject* v = 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); } GObject* @@ -89,7 +89,7 @@ do_foo (void) _data1_->_ref_count_ = 1; _tmp0_ = g_object_new (G_TYPE_OBJECT, NULL); _data1_->_result_ = _tmp0_; - do_bar (___lambda4__func, _data1_); + do_bar (__vala_lambda0__func, _data1_); _tmp1_ = _g_object_ref0 (_data1_->_result_); result = _tmp1_; block1_data_unref (_data1_); diff --git a/tests/methods/bug598738.c-expected b/tests/methods/bug598738.c-expected index 8eb818bcc..fa330aa4e 100644 --- a/tests/methods/bug598738.c-expected +++ b/tests/methods/bug598738.c-expected @@ -20,8 +20,8 @@ struct _Block1Data { 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__func (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__func (gpointer self); static Block1Data* block1_data_ref (Block1Data* _data1_) @@ -42,15 +42,15 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _vala_assert (_data1_->array_length1 == 10, "array.length == 10"); } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -67,7 +67,7 @@ _vala_main (void) _data1_->array = _tmp0_; _data1_->array_length1 = 10; _data1_->_array_size_ = _data1_->array_length1; - foo = ___lambda4__func; + foo = __vala_lambda0__func; foo_target = block1_data_ref (_data1_); foo_target_destroy_notify = block1_data_unref; foo (foo_target); diff --git a/tests/methods/bug613483.c-expected b/tests/methods/bug613483.c-expected index 991f22a14..b102dc943 100644 --- a/tests/methods/bug613483.c-expected +++ b/tests/methods/bug613483.c-expected @@ -72,8 +72,8 @@ static void foo_set_bar (Foo* self, gint value); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean _foo_bar___lambda4_ (Block1Data* _data1_); -static gboolean __foo_bar___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void foo_finalize (Foo * obj); static GType foo_get_type_once (void); static void _vala_main (void); @@ -113,7 +113,7 @@ block1_data_unref (void * _userdata_) } static gboolean -_foo_bar___lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; gint i = 0; @@ -125,10 +125,10 @@ _foo_bar___lambda4_ (Block1Data* _data1_) } static gboolean -__foo_bar___lambda4__gsource_func (gpointer self) +__vala_lambda0__gsource_func (gpointer self) { gboolean result; - result = _foo_bar___lambda4_ (self); + result = _vala_lambda0_ (self); return result; } @@ -142,7 +142,7 @@ foo_set_bar (Foo* self, _data1_->_ref_count_ = 1; _data1_->self = foo_ref (self); _data1_->value = value; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __foo_bar___lambda4__gsource_func, block1_data_ref (_data1_), block1_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __vala_lambda0__gsource_func, block1_data_ref (_data1_), block1_data_unref); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/methods/bug622570.c-expected b/tests/methods/bug622570.c-expected index 0787494f2..e10c320c8 100644 --- a/tests/methods/bug622570.c-expected +++ b/tests/methods/bug622570.c-expected @@ -12,17 +12,17 @@ typedef void (*Deleg2) (GValue* foo, gint* bar, gpointer user_data); #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); static void _vala_main (void); -static gint __lambda4_ (gint* foo); -static gint ___lambda4__deleg1 (gint* foo, - gpointer self); -static void __lambda5_ (GValue* foo, - gint* bar); -static void ___lambda5__deleg2 (GValue* foo, - gint* bar, - gpointer self); +static gint _vala_lambda0_ (gint* foo); +static gint __vala_lambda0__deleg1 (gint* foo, + gpointer self); +static void _vala_lambda1_ (GValue* foo, + gint* bar); +static void __vala_lambda1__deleg2 (GValue* foo, + gint* bar, + gpointer self); static gint -__lambda4_ (gint* foo) +_vala_lambda0_ (gint* foo) { gint result; result = (*foo) + 5; @@ -30,17 +30,17 @@ __lambda4_ (gint* foo) } static gint -___lambda4__deleg1 (gint* foo, - gpointer self) +__vala_lambda0__deleg1 (gint* foo, + gpointer self) { gint result; - result = __lambda4_ (foo); + result = _vala_lambda0_ (foo); return result; } static void -__lambda5_ (GValue* foo, - gint* bar) +_vala_lambda1_ (GValue* foo, + gint* bar) { GValue _vala_foo = {0}; GValue _tmp0_ = {0}; @@ -57,11 +57,11 @@ __lambda5_ (GValue* foo, } static void -___lambda5__deleg2 (GValue* foo, - gint* bar, - gpointer self) +__vala_lambda1__deleg2 (GValue* foo, + gint* bar, + gpointer self) { - __lambda5_ (foo, bar); + _vala_lambda1_ (foo, bar); } static void @@ -81,10 +81,10 @@ _vala_main (void) GValue _tmp2_; a = 3; b = 4; - d1 = ___lambda4__deleg1; + d1 = __vala_lambda0__deleg1; d1_target = NULL; d1_target_destroy_notify = NULL; - d2 = ___lambda5__deleg2; + d2 = __vala_lambda1__deleg2; d2_target = NULL; d2_target_destroy_notify = NULL; _tmp0_ = d1 (&a, d1_target); diff --git a/tests/methods/bug639054.c-expected b/tests/methods/bug639054.c-expected index b62b6f555..7ef2bf889 100644 --- a/tests/methods/bug639054.c-expected +++ b/tests/methods/bug639054.c-expected @@ -76,17 +76,17 @@ VALA_EXTERN void foo_finish (GAsyncResult* _res_); static gboolean foo_co (FooData* _data_); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void _vala_main (void); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); static guint8* _vala_array_dup1 (guint8* self, gssize length); -static void __lambda5_ (Block2Data* _data2_); -static void ___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self); +static void _vala_lambda1_ (Block2Data* _data2_); +static void __vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self); static inline gpointer _vala_memdup2 (gconstpointer mem, gsize byte_size); @@ -161,7 +161,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gboolean result; _data1_->bar[0] = (guint8) 'b'; @@ -171,10 +171,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; } @@ -194,7 +194,7 @@ foo_co (FooData* _data_) _data_->_data1_->bar_length1 = _data_->bar_length1; _data_->_data1_->baz = _data_->baz; _data_->_data1_->_async_data_ = _data_; - _data_->f = ___lambda4__gsource_func; + _data_->f = __vala_lambda0__gsource_func; _data_->f_target = block1_data_ref (_data_->_data1_); _data_->f_target_destroy_notify = block1_data_unref; _data_->f (_data_->f_target); @@ -272,7 +272,7 @@ _vala_array_dup1 (guint8* self, } static void -__lambda5_ (Block2Data* _data2_) +_vala_lambda1_ (Block2Data* _data2_) { guint8 _tmp0_; _tmp0_ = _data2_->bar[0]; @@ -281,11 +281,11 @@ __lambda5_ (Block2Data* _data2_) } static void -___lambda5__gasync_ready_callback (GObject* source_object, - GAsyncResult* res, - gpointer self) +__vala_lambda1__gasync_ready_callback (GObject* source_object, + GAsyncResult* res, + gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); block2_data_unref (self); } @@ -318,7 +318,7 @@ _vala_main (void) _data2_->_bar_size_ = _data2_->bar_length1; _tmp5_ = baz_new (); _tmp6_ = _tmp5_; - foo (_data2_->bar, (gint) _data2_->bar_length1, _tmp6_, ___lambda5__gasync_ready_callback, block2_data_ref (_data2_)); + foo (_data2_->bar, (gint) _data2_->bar_length1, _tmp6_, __vala_lambda1__gasync_ready_callback, block2_data_ref (_data2_)); _baz_free0 (_tmp6_); g_main_loop_run (_data2_->loop); block2_data_unref (_data2_); diff --git a/tests/methods/bug642899.c-expected b/tests/methods/bug642899.c-expected index 1b4aecd1c..8dca73b4b 100644 --- a/tests/methods/bug642899.c-expected +++ b/tests/methods/bug642899.c-expected @@ -76,8 +76,8 @@ VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); static void foo_finalize (Foo * obj); static GType foo_get_type_once (void); static void _vala_main (void); @@ -116,7 +116,7 @@ _g_object_ref0 (gpointer self) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; GObject* _tmp0_; @@ -132,10 +132,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; } @@ -152,7 +152,7 @@ foo_construct (GType object_type) _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/methods/bug646345.c-expected b/tests/methods/bug646345.c-expected index 4591c3e12..e4529caca 100644 --- a/tests/methods/bug646345.c-expected +++ b/tests/methods/bug646345.c-expected @@ -22,14 +22,14 @@ struct _Block2Data { static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___lambda4__gsource_func (gpointer self); -static gboolean __lambda5_ (void); +static gboolean _vala_lambda0_ (Block1Data* _data1_); +static gboolean __vala_lambda0__gsource_func (gpointer self); +static gboolean _vala_lambda1_ (void); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static gboolean __lambda6_ (Block2Data* _data2_); -static gboolean ___lambda6__gsource_func (gpointer self); -static gboolean ___lambda5__gsource_func (gpointer self); +static gboolean _vala_lambda2_ (Block2Data* _data2_); +static gboolean __vala_lambda2__gsource_func (gpointer self); +static gboolean __vala_lambda1__gsource_func (gpointer self); static Block1Data* block1_data_ref (Block1Data* _data1_) @@ -50,7 +50,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gchar* _tmp0_; gboolean result; @@ -62,10 +62,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; } @@ -88,7 +88,7 @@ block2_data_unref (void * _userdata_) } static gboolean -__lambda6_ (Block2Data* _data2_) +_vala_lambda2_ (Block2Data* _data2_) { gchar* _tmp0_; gboolean result; @@ -100,15 +100,15 @@ __lambda6_ (Block2Data* _data2_) } static gboolean -___lambda6__gsource_func (gpointer self) +__vala_lambda2__gsource_func (gpointer self) { gboolean result; - result = __lambda6_ (self); + result = _vala_lambda2_ (self); return result; } static gboolean -__lambda5_ (void) +_vala_lambda1_ (void) { Block2Data* _data2_; gchar* _tmp0_; @@ -120,7 +120,7 @@ __lambda5_ (void) _data2_->_ref_count_ = 1; _tmp0_ = g_strdup ("innerfoo"); _data2_->innervar = _tmp0_; - innerfunc = ___lambda6__gsource_func; + innerfunc = __vala_lambda2__gsource_func; innerfunc_target = block2_data_ref (_data2_); innerfunc_target_destroy_notify = block2_data_unref; result = FALSE; @@ -134,10 +134,10 @@ __lambda5_ (void) } static gboolean -___lambda5__gsource_func (gpointer self) +__vala_lambda1__gsource_func (gpointer self) { gboolean result; - result = __lambda5_ (); + result = _vala_lambda1_ (); return result; } @@ -156,10 +156,10 @@ _vala_main (void) _data1_->_ref_count_ = 1; _tmp0_ = g_strdup ("outerfoo"); _data1_->outervar = _tmp0_; - firstfunc = ___lambda4__gsource_func; + firstfunc = __vala_lambda0__gsource_func; firstfunc_target = block1_data_ref (_data1_); firstfunc_target_destroy_notify = block1_data_unref; - secondfunc = ___lambda5__gsource_func; + secondfunc = __vala_lambda1__gsource_func; secondfunc_target = NULL; secondfunc_target_destroy_notify = NULL; (secondfunc_target_destroy_notify == NULL) ? NULL : (secondfunc_target_destroy_notify (secondfunc_target), NULL); diff --git a/tests/methods/bug648320.c-expected b/tests/methods/bug648320.c-expected index ea27691df..7d44e4ff0 100644 --- a/tests/methods/bug648320.c-expected +++ b/tests/methods/bug648320.c-expected @@ -41,9 +41,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) VALA_EXTERN void foo_foo (Foo* self); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); +static gboolean _vala_lambda0_ (Block1Data* _data1_); VALA_EXTERN gint foo_get_i (Foo* self); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean __vala_lambda0__gsource_func (gpointer self); VALA_EXTERN void foo_set_i (Foo* self, gint value); static GType foo_get_type_once (void); @@ -70,7 +70,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; gint _tmp0_; @@ -84,10 +84,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; } @@ -102,7 +102,7 @@ foo_foo (Foo* self) _data1_->_ref_count_ = 1; _data1_->self = g_object_ref (self); _data1_->j = 0; - bar = ___lambda4__gsource_func; + bar = __vala_lambda0__gsource_func; bar_target = block1_data_ref (_data1_); bar_target_destroy_notify = block1_data_unref; (bar_target_destroy_notify == NULL) ? NULL : (bar_target_destroy_notify (bar_target), NULL); diff --git a/tests/methods/bug649562.c-expected b/tests/methods/bug649562.c-expected index ec1d60c13..ec493286e 100644 --- a/tests/methods/bug649562.c-expected +++ b/tests/methods/bug649562.c-expected @@ -4,11 +4,11 @@ #include <glib.h> static void _vala_main (void); -static gboolean __lambda4_ (void); -static gboolean ___lambda4__gsource_func (gpointer self); +static gboolean _vala_lambda0_ (void); +static gboolean __vala_lambda0__gsource_func (gpointer self); static gboolean -__lambda4_ (void) +_vala_lambda0_ (void) { static const gint b = 3; gboolean result; @@ -17,10 +17,10 @@ __lambda4_ (void) } static gboolean -___lambda4__gsource_func (gpointer self) +__vala_lambda0__gsource_func (gpointer self) { gboolean result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } @@ -33,7 +33,7 @@ _vala_main (void) { static const gint a = 2; } - f = ___lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = NULL; f_target_destroy_notify = NULL; (f_target_destroy_notify == NULL) ? NULL : (f_target_destroy_notify (f_target), NULL); diff --git a/tests/methods/bug653391.c-expected b/tests/methods/bug653391.c-expected index d6bee4d8b..b9885a80c 100644 --- a/tests/methods/bug653391.c-expected +++ b/tests/methods/bug653391.c-expected @@ -33,8 +33,8 @@ VALA_EXTERN Deleg foo (gchar* bar, GDestroyNotify* result_target_destroy_notify); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gchar* __lambda4_ (Block1Data* _data1_); -static gchar* ___lambda4__deleg (gpointer self); +static gchar* _vala_lambda0_ (Block1Data* _data1_); +static gchar* __vala_lambda0__deleg (gpointer self); static void _vala_main (void); static Block1Data* @@ -56,7 +56,7 @@ block1_data_unref (void * _userdata_) } static gchar* -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gchar* _tmp0_; gchar* result; @@ -66,10 +66,10 @@ __lambda4_ (Block1Data* _data1_) } static gchar* -___lambda4__deleg (gpointer self) +__vala_lambda0__deleg (gpointer self) { gchar* result; - result = __lambda4_ (self); + result = _vala_lambda0_ (self); return result; } @@ -88,7 +88,7 @@ foo (gchar* bar, _data1_->_ref_count_ = 1; _g_free0 (_data1_->bar); _data1_->bar = bar; - _tmp0_ = ___lambda4__deleg; + _tmp0_ = __vala_lambda0__deleg; _tmp0__target = block1_data_ref (_data1_); _tmp0__target_destroy_notify = block1_data_unref; *result_target = _tmp0__target; diff --git a/tests/methods/bug663210.c-expected b/tests/methods/bug663210.c-expected index ae6b2a7df..86d7453d0 100644 --- a/tests/methods/bug663210.c-expected +++ b/tests/methods/bug663210.c-expected @@ -75,8 +75,8 @@ static void foo_foo (Foo* self, GDestroyNotify t_destroy_func); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___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 (Foo * obj); @@ -111,7 +111,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; GType t_type; @@ -129,10 +129,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; } @@ -154,7 +154,7 @@ foo_foo (Foo* self, _data1_->t_dup_func = t_dup_func; _data1_->t_destroy_func = t_destroy_func; _data1_->retval = NULL; - f = ___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/methods/closures.c-expected b/tests/methods/closures.c-expected index 91b001d8e..83255eac6 100644 --- a/tests/methods/closures.c-expected +++ b/tests/methods/closures.c-expected @@ -88,8 +88,8 @@ VALA_EXTERN void foo_bar (Foo* self, GMainLoop* loop); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gboolean __lambda4_ (Block1Data* _data1_); -static gboolean ___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 GType foo_get_type_once (void); @@ -106,25 +106,25 @@ VALA_EXTERN gint A (gint k, gpointer x5_target); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static gint __lambda5_ (Block2Data* _data2_); -static gint ___lambda5__func (gpointer self); +static gint _vala_lambda1_ (Block2Data* _data2_); +static gint __vala_lambda1__func (gpointer self); VALA_EXTERN void B (gint* array, NoTargetFunc func); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static gint __lambda6_ (Block3Data* _data3_); -static gint ___lambda6__func (gpointer self); +static gint _vala_lambda2_ (Block3Data* _data3_); +static gint __vala_lambda2__func (gpointer self); static void _vala_main (void); -static gint __lambda7_ (void); -static gint ___lambda7__func (gpointer self); -static gint __lambda8_ (void); -static gint ___lambda8__func (gpointer self); -static gint __lambda9_ (void); -static gint ___lambda9__func (gpointer self); -static gint __lambda10_ (void); -static gint ___lambda10__func (gpointer self); -static gint __lambda11_ (void); -static gint ___lambda11__func (gpointer self); +static gint _vala_lambda3_ (void); +static gint __vala_lambda3__func (gpointer self); +static gint _vala_lambda4_ (void); +static gint __vala_lambda4__func (gpointer self); +static gint _vala_lambda5_ (void); +static gint __vala_lambda5__func (gpointer self); +static gint _vala_lambda6_ (void); +static gint __vala_lambda6__func (gpointer self); +static gint _vala_lambda7_ (void); +static gint __vala_lambda7__func (gpointer self); static gssize _vala_array_length (gpointer array); static gpointer @@ -156,7 +156,7 @@ block1_data_unref (void * _userdata_) } static gboolean -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Foo* self; gboolean result; @@ -169,10 +169,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; } @@ -199,7 +199,7 @@ foo_bar (Foo* self, _data1_->loop = _tmp0_; _tmp1_ = g_object_new (G_TYPE_OBJECT, NULL); _data1_->o = _tmp1_; - f = ___lambda4__gsource_func; + f = __vala_lambda0__gsource_func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; _tmp2_ = f; @@ -287,7 +287,7 @@ block2_data_unref (void * _userdata_) } static gint -__lambda5_ (Block2Data* _data2_) +_vala_lambda1_ (Block2Data* _data2_) { Func _tmp0_; gpointer _tmp0__target; @@ -300,10 +300,10 @@ __lambda5_ (Block2Data* _data2_) } static gint -___lambda5__func (gpointer self) +__vala_lambda1__func (gpointer self) { gint result; - result = __lambda5_ (self); + result = _vala_lambda1_ (self); return result; } @@ -341,7 +341,7 @@ A (gint k, _data2_->B = NULL; _data2_->B_target = NULL; _data2_->B_target_destroy_notify = NULL; - _data2_->B = ___lambda5__func; + _data2_->B = __vala_lambda1__func; _data2_->B_target = block2_data_ref (_data2_); _data2_->B_target_destroy_notify = block2_data_unref; if (_data2_->k <= 0) { @@ -377,7 +377,7 @@ block3_data_unref (void * _userdata_) } static gint -__lambda6_ (Block3Data* _data3_) +_vala_lambda2_ (Block3Data* _data3_) { gint result; _data3_->array = NULL; @@ -387,10 +387,10 @@ __lambda6_ (Block3Data* _data3_) } static gint -___lambda6__func (gpointer self) +__vala_lambda2__func (gpointer self) { gint result; - result = __lambda6_ (self); + result = _vala_lambda2_ (self); return result; } @@ -406,7 +406,7 @@ B (gint* array, _data3_->_ref_count_ = 1; _data3_->array = array; _data3_->func = func; - C = ___lambda6__func; + C = __vala_lambda2__func; C_target = block3_data_ref (_data3_); C_target_destroy_notify = block3_data_unref; (C_target_destroy_notify == NULL) ? NULL : (C_target_destroy_notify (C_target), NULL); @@ -418,7 +418,7 @@ B (gint* array, } static gint -__lambda7_ (void) +_vala_lambda3_ (void) { gint result; result = 1; @@ -426,15 +426,15 @@ __lambda7_ (void) } static gint -___lambda7__func (gpointer self) +__vala_lambda3__func (gpointer self) { gint result; - result = __lambda7_ (); + result = _vala_lambda3_ (); return result; } static gint -__lambda8_ (void) +_vala_lambda4_ (void) { gint result; result = -1; @@ -442,15 +442,15 @@ __lambda8_ (void) } static gint -___lambda8__func (gpointer self) +__vala_lambda4__func (gpointer self) { gint result; - result = __lambda8_ (); + result = _vala_lambda4_ (); return result; } static gint -__lambda9_ (void) +_vala_lambda5_ (void) { gint result; result = -1; @@ -458,15 +458,15 @@ __lambda9_ (void) } static gint -___lambda9__func (gpointer self) +__vala_lambda5__func (gpointer self) { gint result; - result = __lambda9_ (); + result = _vala_lambda5_ (); return result; } static gint -__lambda10_ (void) +_vala_lambda6_ (void) { gint result; result = 1; @@ -474,15 +474,15 @@ __lambda10_ (void) } static gint -___lambda10__func (gpointer self) +__vala_lambda6__func (gpointer self) { gint result; - result = __lambda10_ (); + result = _vala_lambda6_ (); return result; } static gint -__lambda11_ (void) +_vala_lambda7_ (void) { gint result; result = 0; @@ -490,10 +490,10 @@ __lambda11_ (void) } static gint -___lambda11__func (gpointer self) +__vala_lambda7__func (gpointer self) { gint result; - result = __lambda11_ (); + result = _vala_lambda7_ (); return result; } @@ -505,7 +505,7 @@ _vala_main (void) Foo* _tmp0_; GMainLoop* loop = NULL; GMainLoop* _tmp1_; - _result_ = A (10, ___lambda7__func, NULL, ___lambda8__func, NULL, ___lambda9__func, NULL, ___lambda10__func, NULL, ___lambda11__func, NULL); + _result_ = A (10, __vala_lambda3__func, NULL, __vala_lambda4__func, NULL, __vala_lambda5__func, NULL, __vala_lambda6__func, NULL, __vala_lambda7__func, NULL); _vala_assert (_result_ == -67, "result == -67"); _tmp0_ = foo_new (); foo = _tmp0_; diff --git a/tests/methods/delegate-target.c-expected b/tests/methods/delegate-target.c-expected index 8284c6173..0d0b74132 100644 --- a/tests/methods/delegate-target.c-expected +++ b/tests/methods/delegate-target.c-expected @@ -117,47 +117,47 @@ VALA_EXTERN FooFunc foo_get_bar (Foo* self); VALA_EXTERN void foo_do_bar (Foo* self, FooFunc f); static FooFunc foo_real_get_foo (Foo* self); -static void __lambda4_ (Foo* self); -static void ___lambda4__foo_func (gpointer self); +static void _vala_lambda0_ (Foo* self); +static void __vala_lambda0__foo_func (gpointer self); static void foo_real_do_foo (Foo* self, FooFunc f); static FooFunc foo_real_get_bar (Foo* self); -static void __lambda5_ (Foo* self); -static void ___lambda5__foo_func (gpointer self); +static void _vala_lambda1_ (Foo* self); +static void __vala_lambda1__foo_func (gpointer self); static void foo_real_do_bar (Foo* self, FooFunc f); VALA_EXTERN Foo* foo_new (void); VALA_EXTERN Foo* foo_construct (GType object_type); -static void ___lambda6_ (Foo* self); -static void ____lambda6__foo_func (gpointer self); +static void _vala_lambda2_ (Foo* self); +static void __vala_lambda2__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) static FooFunc bar_real_get_foo (Foo* base); -static void __lambda7_ (Bar* self); -static void ___lambda7__foo_func (gpointer self); +static void _vala_lambda3_ (Bar* self); +static void __vala_lambda3__foo_func (gpointer self); static void bar_real_do_foo (Foo* base, FooFunc f); static FooFunc bar_real_get_bar (Foo* base); -static void __lambda8_ (Bar* self); -static void ___lambda8__foo_func (gpointer self); +static void _vala_lambda4_ (Bar* self); +static void __vala_lambda4__foo_func (gpointer self); static void bar_real_do_bar (Foo* base, FooFunc f); VALA_EXTERN Bar* bar_new (void); VALA_EXTERN Bar* bar_construct (GType object_type); -static void ___lambda9_ (Bar* self); -static void ____lambda9__foo_func (gpointer self); -static void ___lambda10_ (Bar* self); -static void ____lambda10__foo_func (gpointer self); +static void _vala_lambda5_ (Bar* self); +static void __vala_lambda5__foo_func (gpointer self); +static void _vala_lambda6_ (Bar* self); +static void __vala_lambda6__foo_func (gpointer self); static GType bar_get_type_once (void); VALA_EXTERN FooFunc get_foo (void); -static void __lambda11_ (void); -static void ___lambda11__foo_func (gpointer self); +static void _vala_lambda7_ (void); +static void __vala_lambda7__foo_func (gpointer self); VALA_EXTERN void do_foo (FooFunc f); static void _vala_main (void); -static void ___lambda12_ (void); -static void ____lambda12__foo_func (gpointer self); +static void _vala_lambda8_ (void); +static void __vala_lambda8__foo_func (gpointer self); FooFunc ifoo_get_foo (IFoo* self) @@ -211,21 +211,21 @@ ifoo_get_type (void) } 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 FooFunc foo_real_get_foo (Foo* self) { FooFunc result; - result = ___lambda4__foo_func; + result = __vala_lambda0__foo_func; return result; } @@ -262,21 +262,21 @@ foo_do_foo (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); } static FooFunc foo_real_get_bar (Foo* self) { FooFunc result; - result = ___lambda5__foo_func; + result = __vala_lambda1__foo_func; return result; } @@ -313,14 +313,14 @@ foo_do_bar (Foo* self, } static void -___lambda6_ (Foo* self) +_vala_lambda2_ (Foo* self) { } static void -____lambda6__foo_func (gpointer self) +__vala_lambda2__foo_func (gpointer self) { - ___lambda6_ ((Foo*) self); + _vala_lambda2_ ((Foo*) self); } Foo* @@ -345,7 +345,7 @@ foo_construct (GType object_type) f_target_destroy_notify = NULL; } { - foo_do_foo (self, ____lambda6__foo_func); + foo_do_foo (self, __vala_lambda2__foo_func); } return self; } @@ -571,14 +571,14 @@ foo_unref (gpointer instance) } 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); } static FooFunc @@ -587,7 +587,7 @@ bar_real_get_foo (Foo* base) Bar * self; FooFunc result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); - result = ___lambda7__foo_func; + result = __vala_lambda3__foo_func; return result; } @@ -602,14 +602,14 @@ bar_real_do_foo (Foo* base, } static void -__lambda8_ (Bar* self) +_vala_lambda4_ (Bar* self) { } static void -___lambda8__foo_func (gpointer self) +__vala_lambda4__foo_func (gpointer self) { - __lambda8_ ((Bar*) self); + _vala_lambda4_ ((Bar*) self); } static FooFunc @@ -618,7 +618,7 @@ bar_real_get_bar (Foo* base) Bar * self; FooFunc result; self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BAR, Bar); - result = ___lambda8__foo_func; + result = __vala_lambda4__foo_func; return result; } @@ -633,25 +633,25 @@ bar_real_do_bar (Foo* base, } static void -___lambda9_ (Bar* self) +_vala_lambda5_ (Bar* self) { } static void -____lambda9__foo_func (gpointer self) +__vala_lambda5__foo_func (gpointer self) { - ___lambda9_ ((Bar*) self); + _vala_lambda5_ ((Bar*) self); } static void -___lambda10_ (Bar* self) +_vala_lambda6_ (Bar* self) { } static void -____lambda10__foo_func (gpointer self) +__vala_lambda6__foo_func (gpointer self) { - ___lambda10_ ((Bar*) self); + _vala_lambda6_ ((Bar*) self); } Bar* @@ -676,7 +676,7 @@ bar_construct (GType object_type) f_target_destroy_notify = NULL; } { - foo_do_foo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), ____lambda9__foo_func); + foo_do_foo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), __vala_lambda5__foo_func); } { FooFunc f = NULL; @@ -695,7 +695,7 @@ bar_construct (GType object_type) f_target_destroy_notify = NULL; } { - foo_do_bar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), ____lambda10__foo_func); + foo_do_bar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_FOO, Foo), __vala_lambda6__foo_func); } return self; } @@ -745,21 +745,21 @@ bar_get_type (void) } static void -__lambda11_ (void) +_vala_lambda7_ (void) { } static void -___lambda11__foo_func (gpointer self) +__vala_lambda7__foo_func (gpointer self) { - __lambda11_ (); + _vala_lambda7_ (); } FooFunc get_foo (void) { FooFunc result; - result = ___lambda11__foo_func; + result = __vala_lambda7__foo_func; return result; } @@ -771,14 +771,14 @@ do_foo (FooFunc f) } static void -___lambda12_ (void) +_vala_lambda8_ (void) { } static void -____lambda12__foo_func (gpointer self) +__vala_lambda8__foo_func (gpointer self) { - ___lambda12_ (); + _vala_lambda8_ (); } static void @@ -801,7 +801,7 @@ _vala_main (void) f_target_destroy_notify = NULL; } { - do_foo (____lambda12__foo_func); + do_foo (__vala_lambda8__foo_func); } { Foo* foo = NULL; diff --git a/tests/methods/lambda.c-expected b/tests/methods/lambda.c-expected index 7e9538a61..f0ff8cf75 100644 --- a/tests/methods/lambda.c-expected +++ b/tests/methods/lambda.c-expected @@ -55,14 +55,14 @@ static gint maman_bar_do_action (MamanActionCallback cb); static gint maman_bar_do_out_action (MamanActionOutCallback cb); static gint maman_bar_do_ref_action (MamanActionRefCallback cb); static gint maman_bar_main (void); -static gint __lambda4_ (gint i); -static gint ___lambda4__maman_action_callback (gint i); -static gint __lambda5_ (gint i); -static gint ___lambda5__maman_action_callback (gint i); -static void __lambda6_ (gint* i); -static void ___lambda6__maman_action_out_callback (gint* i); -static void __lambda7_ (gint* i); -static void ___lambda7__maman_action_ref_callback (gint* i); +static gint _vala_lambda0_ (gint i); +static gint __vala_lambda0__maman_action_callback (gint i); +static gint _vala_lambda1_ (gint i); +static gint __vala_lambda1__maman_action_callback (gint i); +static void _vala_lambda2_ (gint* i); +static void __vala_lambda2__maman_action_out_callback (gint* i); +static void _vala_lambda3_ (gint* i); +static void __vala_lambda3__maman_action_ref_callback (gint* i); VALA_EXTERN MamanBar* maman_bar_new (void); VALA_EXTERN MamanBar* maman_bar_construct (GType object_type); static GType maman_bar_get_type_once (void); @@ -99,7 +99,7 @@ maman_bar_do_ref_action (MamanActionRefCallback cb) } static gint -__lambda4_ (gint i) +_vala_lambda0_ (gint i) { gint result; result = i * 2; @@ -107,15 +107,15 @@ __lambda4_ (gint i) } static gint -___lambda4__maman_action_callback (gint i) +__vala_lambda0__maman_action_callback (gint i) { gint result; - result = __lambda4_ (i); + result = _vala_lambda0_ (i); return result; } static gint -__lambda5_ (gint i) +_vala_lambda1_ (gint i) { gint result; result = i * 3; @@ -123,15 +123,15 @@ __lambda5_ (gint i) } static gint -___lambda5__maman_action_callback (gint i) +__vala_lambda1__maman_action_callback (gint i) { gint result; - result = __lambda5_ (i); + result = _vala_lambda1_ (i); return result; } static void -__lambda6_ (gint* i) +_vala_lambda2_ (gint* i) { gint _vala_i = 0; _vala_i = 4; @@ -141,31 +141,31 @@ __lambda6_ (gint* i) } static void -___lambda6__maman_action_out_callback (gint* i) +__vala_lambda2__maman_action_out_callback (gint* i) { - __lambda6_ (i); + _vala_lambda2_ (i); } static void -__lambda7_ (gint* i) +_vala_lambda3_ (gint* i) { *i = (*i) + 4; } static void -___lambda7__maman_action_ref_callback (gint* i) +__vala_lambda3__maman_action_ref_callback (gint* i) { - __lambda7_ (i); + _vala_lambda3_ (i); } static gint maman_bar_main (void) { gint result; - _vala_assert (maman_bar_do_action (___lambda4__maman_action_callback) == 2, "do_action (i => i * 2) == 2"); - _vala_assert (maman_bar_do_action (___lambda5__maman_action_callback) == 3, "do_action (i => { return i * 3; }) == 3"); - _vala_assert (maman_bar_do_out_action (___lambda6__maman_action_out_callback) == 4, "do_out_action ((out i) => { i = 4; }) == 4"); - _vala_assert (maman_bar_do_ref_action (___lambda7__maman_action_ref_callback) == 5, "do_ref_action ((ref i) => { i += 4; }) == 5"); + _vala_assert (maman_bar_do_action (__vala_lambda0__maman_action_callback) == 2, "do_action (i => i * 2) == 2"); + _vala_assert (maman_bar_do_action (__vala_lambda1__maman_action_callback) == 3, "do_action (i => { return i * 3; }) == 3"); + _vala_assert (maman_bar_do_out_action (__vala_lambda2__maman_action_out_callback) == 4, "do_out_action ((out i) => { i = 4; }) == 4"); + _vala_assert (maman_bar_do_ref_action (__vala_lambda3__maman_action_ref_callback) == 5, "do_ref_action ((ref i) => { i += 4; }) == 5"); result = 0; return result; } diff --git a/tests/methods/local-functions.c-expected b/tests/methods/local-functions.c-expected index 92ac20ce4..55b44d26e 100644 --- a/tests/methods/local-functions.c-expected +++ b/tests/methods/local-functions.c-expected @@ -25,19 +25,19 @@ struct _Block1Data { static void _vala_main (void); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gint ___lambda4_ (Block1Data* _data1_); -static gint ____lambda4___localfunc0_ (gpointer self); -static gboolean ___lambda5_ (gint a, - gint b); -static gboolean ____lambda5___localfunc1_ (gint a, - gint b, - gpointer self); -static void ___lambda6_ (gchar** s); -static void ____lambda6___localfunc2_ (gchar** s, - gpointer self); -static const gchar* ___lambda7_ (gchar** s); -static const gchar* ____lambda7___localfunc3_ (gchar** s, - gpointer self); +static gint _vala_lambda0_ (Block1Data* _data1_); +static gint __vala_lambda0___localfunc0_ (gpointer self); +static gboolean _vala_lambda1_ (gint a, + gint b); +static gboolean __vala_lambda1___localfunc1_ (gint a, + gint b, + gpointer self); +static void _vala_lambda2_ (gchar** s); +static void __vala_lambda2___localfunc2_ (gchar** s, + gpointer self); +static const gchar* _vala_lambda3_ (gchar** s); +static const gchar* __vala_lambda3___localfunc3_ (gchar** s, + gpointer self); static Block1Data* block1_data_ref (Block1Data* _data1_) @@ -57,7 +57,7 @@ block1_data_unref (void * _userdata_) } static gint -___lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { gint result; result = _data1_->x + _data1_->y; @@ -65,16 +65,16 @@ ___lambda4_ (Block1Data* _data1_) } static gint -____lambda4___localfunc0_ (gpointer self) +__vala_lambda0___localfunc0_ (gpointer self) { gint result; - result = ___lambda4_ (self); + result = _vala_lambda0_ (self); return result; } static gboolean -___lambda5_ (gint a, - gint b) +_vala_lambda1_ (gint a, + gint b) { gboolean result; _vala_assert ((a * b) == 966, "a * b == 966"); @@ -83,17 +83,17 @@ ___lambda5_ (gint a, } static gboolean -____lambda5___localfunc1_ (gint a, - gint b, - gpointer self) +__vala_lambda1___localfunc1_ (gint a, + gint b, + gpointer self) { gboolean result; - result = ___lambda5_ (a, b); + result = _vala_lambda1_ (a, b); return result; } static void -___lambda6_ (gchar** s) +_vala_lambda2_ (gchar** s) { gchar* _vala_s = NULL; gchar* _tmp0_; @@ -108,14 +108,14 @@ ___lambda6_ (gchar** s) } static void -____lambda6___localfunc2_ (gchar** s, - gpointer self) +__vala_lambda2___localfunc2_ (gchar** s, + gpointer self) { - ___lambda6_ (s); + _vala_lambda2_ (s); } static const gchar* -___lambda7_ (gchar** s) +_vala_lambda3_ (gchar** s) { gchar* _tmp0_; const gchar* result; @@ -129,11 +129,11 @@ ___lambda7_ (gchar** s) } static const gchar* -____lambda7___localfunc3_ (gchar** s, - gpointer self) +__vala_lambda3___localfunc3_ (gchar** s, + gpointer self) { const gchar* result; - result = ___lambda7_ (s); + result = _vala_lambda3_ (s); return result; } @@ -148,7 +148,7 @@ _vala_main (void) _data1_->_ref_count_ = 1; _data1_->x = 23; _data1_->y = 42; - foo = ____lambda4___localfunc0_; + foo = __vala_lambda0___localfunc0_; foo_target = _data1_; _vala_assert (foo (foo_target) == 65, "foo () == 65"); block1_data_unref (_data1_); @@ -157,7 +157,7 @@ _vala_main (void) { _LocalFunc1_ foo = NULL; gpointer foo_target; - foo = ____lambda5___localfunc1_; + foo = __vala_lambda1___localfunc1_; foo_target = NULL; _vala_assert (foo (23, 42, foo_target), "foo (23, 42)"); } @@ -166,7 +166,7 @@ _vala_main (void) gpointer foo_target; gchar* s = NULL; gchar* _tmp0_ = NULL; - foo = ____lambda6___localfunc2_; + foo = __vala_lambda2___localfunc2_; foo_target = NULL; foo (&_tmp0_, foo_target); _g_free0 (s); @@ -181,7 +181,7 @@ _vala_main (void) gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - foo = ____lambda7___localfunc3_; + foo = __vala_lambda3___localfunc3_; foo_target = NULL; _tmp1_ = g_strdup ("foo"); s = _tmp1_; diff --git a/tests/methods/parameter-ref-array-resize-captured.c-expected b/tests/methods/parameter-ref-array-resize-captured.c-expected index 2e8550d81..3da0ff951 100644 --- a/tests/methods/parameter-ref-array-resize-captured.c-expected +++ b/tests/methods/parameter-ref-array-resize-captured.c-expected @@ -28,8 +28,8 @@ VALA_EXTERN void foo (gint** a, 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); static void _vala_array_add1 (gint* * array, gint* length, gint* size, @@ -65,16 +65,16 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { foo (&_data1_->a, (gint*) (&_data1_->a_length1)); _data1_->_a_size_ = _data1_->a_length1; } static void -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } static void @@ -106,7 +106,7 @@ _vala_main (void) _data1_->a = _tmp0_; _data1_->a_length1 = (10 * 1024) * 1024; _data1_->_a_size_ = _data1_->a_length1; - func = ___lambda4__foo_func; + func = __vala_lambda0__foo_func; func_target = block1_data_ref (_data1_); func_target_destroy_notify = block1_data_unref; _tmp1_ = func; diff --git a/tests/methods/parameter-ref-delegate.c-expected b/tests/methods/parameter-ref-delegate.c-expected index 2ee6601f5..1489d4746 100644 --- a/tests/methods/parameter-ref-delegate.c-expected +++ b/tests/methods/parameter-ref-delegate.c-expected @@ -29,18 +29,18 @@ VALA_EXTERN void foo (gint i, FooFunc* func, gpointer* func_target, GDestroyNotify* func_target_destroy_notify); -static gint __lambda4_ (void); -static gint ___lambda4__foo_func (gpointer self); +static gint _vala_lambda0_ (void); +static gint __vala_lambda0__foo_func (gpointer self); VALA_EXTERN gint bar (void); static void _vala_main (void); static gint _bar_foo_func (gpointer self); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static gint ___lambda5_ (Block1Data* _data1_); -static gint ____lambda5__foo_func (gpointer self); +static gint _vala_lambda1_ (Block1Data* _data1_); +static gint __vala_lambda1__foo_func (gpointer self); static gint -__lambda4_ (void) +_vala_lambda0_ (void) { gint result; result = 4711; @@ -48,10 +48,10 @@ __lambda4_ (void) } static gint -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { gint result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } @@ -66,7 +66,7 @@ foo (gint i, *func = NULL; *func_target = NULL; *func_target_destroy_notify = NULL; - *func = ___lambda4__foo_func; + *func = __vala_lambda0__foo_func; *func_target = NULL; *func_target_destroy_notify = NULL; } @@ -105,7 +105,7 @@ block1_data_unref (void * _userdata_) } static gint -___lambda5_ (Block1Data* _data1_) +_vala_lambda1_ (Block1Data* _data1_) { gint result; result = _data1_->i; @@ -113,10 +113,10 @@ ___lambda5_ (Block1Data* _data1_) } static gint -____lambda5__foo_func (gpointer self) +__vala_lambda1__foo_func (gpointer self) { gint result; - result = ___lambda5_ (self); + result = _vala_lambda1_ (self); return result; } @@ -158,7 +158,7 @@ _vala_main (void) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->i = 42; - func = ____lambda5__foo_func; + func = __vala_lambda1__foo_func; func_target = block1_data_ref (_data1_); func_target_destroy_notify = block1_data_unref; _tmp2_ = func; diff --git a/tests/methods/prepostconditions-captured.c-expected b/tests/methods/prepostconditions-captured.c-expected index 32b10d05d..b3c199a42 100644 --- a/tests/methods/prepostconditions-captured.c-expected +++ b/tests/methods/prepostconditions-captured.c-expected @@ -56,13 +56,13 @@ struct _FooData { VALA_EXTERN gint bar (gint i); 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); VALA_EXTERN void baz (gint i); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); -static void __lambda5_ (Block2Data* _data2_); -static void ___lambda5__func (gpointer self); +static void _vala_lambda1_ (Block2Data* _data2_); +static void __vala_lambda1__func (gpointer self); static void foo_data_free (gpointer _data); VALA_EXTERN void foo (gint i, GAsyncReadyCallback _callback_, @@ -71,8 +71,8 @@ VALA_EXTERN gint foo_finish (GAsyncResult* _res_); static gboolean foo_co (FooData* _data_); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static void __lambda6_ (Block3Data* _data3_); -static void ___lambda6__func (gpointer self); +static void _vala_lambda2_ (Block3Data* _data3_); +static void __vala_lambda2__func (gpointer self); static void _vala_main (void); static Block1Data* @@ -93,16 +93,16 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { _vala_assert (_data1_->i == 23, "i == 23"); _data1_->i = 42; } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } gint @@ -117,7 +117,7 @@ bar (gint i) _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->i = i; - f = ___lambda4__func; + f = __vala_lambda0__func; f_target = block1_data_ref (_data1_); f_target_destroy_notify = block1_data_unref; f (f_target); @@ -150,16 +150,16 @@ block2_data_unref (void * _userdata_) } static void -__lambda5_ (Block2Data* _data2_) +_vala_lambda1_ (Block2Data* _data2_) { _vala_assert (_data2_->i == 42, "i == 42"); _data2_->i = 23; } static void -___lambda5__func (gpointer self) +__vala_lambda1__func (gpointer self) { - __lambda5_ (self); + _vala_lambda1_ (self); } void @@ -173,7 +173,7 @@ baz (gint i) _data2_ = g_slice_new0 (Block2Data); _data2_->_ref_count_ = 1; _data2_->i = i; - f = ___lambda5__func; + f = __vala_lambda1__func; f_target = block2_data_ref (_data2_); f_target_destroy_notify = block2_data_unref; f (f_target); @@ -235,16 +235,16 @@ block3_data_unref (void * _userdata_) } static void -__lambda6_ (Block3Data* _data3_) +_vala_lambda2_ (Block3Data* _data3_) { _vala_assert (_data3_->i == 23, "i == 23"); _data3_->i = 42; } static void -___lambda6__func (gpointer self) +__vala_lambda2__func (gpointer self) { - __lambda6_ (self); + _vala_lambda2_ (self); } static gboolean @@ -262,7 +262,7 @@ foo_co (FooData* _data_) _data_->_data3_->_ref_count_ = 1; _data_->_data3_->i = _data_->i; _data_->_data3_->_async_data_ = _data_; - _data_->f = ___lambda6__func; + _data_->f = __vala_lambda2__func; _data_->f_target = block3_data_ref (_data_->_data3_); _data_->f_target_destroy_notify = block3_data_unref; _data_->f (_data_->f_target); diff --git a/tests/methods/return-unowned-delegate.c-expected b/tests/methods/return-unowned-delegate.c-expected index d99c1ab3a..98f5eac3d 100644 --- a/tests/methods/return-unowned-delegate.c-expected +++ b/tests/methods/return-unowned-delegate.c-expected @@ -22,8 +22,8 @@ typedef gint (*FooFunc) (gpointer user_data); VALA_EXTERN FooFunc foo (gpointer* result_target); VALA_EXTERN gint manam (void); VALA_EXTERN FooFunc bar (gpointer* result_target); -static gint __lambda4_ (void); -static gint ___lambda4__foo_func (gpointer self); +static gint _vala_lambda0_ (void); +static gint __vala_lambda0__foo_func (gpointer self); static void _vala_main (void); FooFunc @@ -40,7 +40,7 @@ foo (gpointer* result_target) } static gint -__lambda4_ (void) +_vala_lambda0_ (void) { gint result; result = 4711; @@ -48,10 +48,10 @@ __lambda4_ (void) } static gint -___lambda4__foo_func (gpointer self) +__vala_lambda0__foo_func (gpointer self) { gint result; - result = __lambda4_ (); + result = _vala_lambda0_ (); return result; } @@ -61,7 +61,7 @@ bar (gpointer* result_target) FooFunc _tmp0_; gpointer _tmp0__target; FooFunc result; - _tmp0_ = ___lambda4__foo_func; + _tmp0_ = __vala_lambda0__foo_func; _tmp0__target = NULL; *result_target = _tmp0__target; result = _tmp0_; diff --git a/tests/methods/symbolresolution.c-expected b/tests/methods/symbolresolution.c-expected index 0e004086c..f91de2c83 100644 --- a/tests/methods/symbolresolution.c-expected +++ b/tests/methods/symbolresolution.c-expected @@ -77,16 +77,16 @@ VALA_EXTERN void class_test (Class* self, gpointer foo_target); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__class_foo (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__class_foo (gpointer self); static void class_active_scope (Class* self); VALA_EXTERN Class* class_new (void); VALA_EXTERN Class* class_construct (GType object_type); static void class_finalize (Class * obj); static GType class_get_type_once (void); static void _vala_main (void); -static void __lambda5_ (void); -static void ___lambda5__class_foo (gpointer self); +static void _vala_lambda1_ (void); +static void __vala_lambda1__class_foo (gpointer self); static void _vala_array_destroy (gpointer array, gssize array_length, GDestroyNotify destroy_func); @@ -122,7 +122,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { Class* self; self = _data1_->self; @@ -130,9 +130,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__class_foo (gpointer self) +__vala_lambda0__class_foo (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } void @@ -150,7 +150,7 @@ class_test (Class* self, _data1_->self = class_ref (self); _data1_->foo = foo; _data1_->foo_target = foo_target; - func = ___lambda4__class_foo; + func = __vala_lambda0__class_foo; func_target = block1_data_ref (_data1_); func_target_destroy_notify = block1_data_unref; func (func_target); @@ -407,14 +407,14 @@ class_unref (gpointer instance) } static void -__lambda5_ (void) +_vala_lambda1_ (void) { } static void -___lambda5__class_foo (gpointer self) +__vala_lambda1__class_foo (gpointer self) { - __lambda5_ (); + _vala_lambda1_ (); } static void @@ -424,7 +424,7 @@ _vala_main (void) Class* _tmp0_; _tmp0_ = class_new (); cl = _tmp0_; - class_test (cl, ___lambda5__class_foo, NULL); + class_test (cl, __vala_lambda1__class_foo, NULL); _class_unref0 (cl); } 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_); diff --git a/tests/structs/bug622422.c-expected b/tests/structs/bug622422.c-expected index 2d3b812a8..319f7657f 100644 --- a/tests/structs/bug622422.c-expected +++ b/tests/structs/bug622422.c-expected @@ -39,8 +39,8 @@ VALA_EXTERN void do_foo_lambda (Foo* foo, GValue* value); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (void * _userdata_); -static void __lambda4_ (Block1Data* _data1_); -static void ___lambda4__test_delegate (gpointer self); +static void _vala_lambda0_ (Block1Data* _data1_); +static void __vala_lambda0__test_delegate (gpointer self); static void _vala_main (void); Foo* @@ -103,7 +103,7 @@ block1_data_unref (void * _userdata_) } static void -__lambda4_ (Block1Data* _data1_) +_vala_lambda0_ (Block1Data* _data1_) { GValue _tmp0_ = {0}; GValue _tmp1_; @@ -124,9 +124,9 @@ __lambda4_ (Block1Data* _data1_) } static void -___lambda4__test_delegate (gpointer self) +__vala_lambda0__test_delegate (gpointer self) { - __lambda4_ (self); + _vala_lambda0_ (self); } void @@ -154,7 +154,7 @@ do_foo_lambda (Foo* foo, } G_IS_VALUE (&_data1_->value) ? (g_value_unset (&_data1_->value), NULL) : NULL; _data1_->value = _tmp3_; - do_foo (___lambda4__test_delegate, _data1_); + do_foo (__vala_lambda0__test_delegate, _data1_); block1_data_unref (_data1_); _data1_ = NULL; } diff --git a/tests/structs/structs.c-expected b/tests/structs/structs.c-expected index 8175ad78f..aa672b343 100644 --- a/tests/structs/structs.c-expected +++ b/tests/structs/structs.c-expected @@ -89,8 +89,8 @@ VALA_EXTERN void test_in_nullable_parameter (SimpleStruct* st); VALA_EXTERN void test_ref_parameter (SimpleStruct* st); VALA_EXTERN void test_out_parameter (SimpleStruct* st); VALA_EXTERN void test_struct_with_func (void); -static void __lambda4_ (void); -static void ___lambda4__func (gpointer self); +static void _vala_lambda0_ (void); +static void __vala_lambda0__func (gpointer self); static void _vala_StructWithFunc_array_free (StructWithFunc * array, gssize array_length); static void _vala_main (void); @@ -388,14 +388,14 @@ test_out_parameter (SimpleStruct* st) } static void -__lambda4_ (void) +_vala_lambda0_ (void) { } static void -___lambda4__func (gpointer self) +__vala_lambda0__func (gpointer self) { - __lambda4_ (); + _vala_lambda0_ (); } static void @@ -419,7 +419,7 @@ test_struct_with_func (void) StructWithFunc* _tmp1_; gint foes_length1; gint _foes_size_; - struct_with_func_init (&_tmp0_, ___lambda4__func, NULL, NULL); + struct_with_func_init (&_tmp0_, __vala_lambda0__func, NULL, NULL); _tmp1_ = g_new0 (StructWithFunc, 1); _tmp1_[0] = _tmp0_; foes = _tmp1_; diff --git a/tests/threads/threadpool.c-expected b/tests/threads/threadpool.c-expected index 615c349f5..97c75e2e7 100644 --- a/tests/threads/threadpool.c-expected +++ b/tests/threads/threadpool.c-expected @@ -26,12 +26,12 @@ VALA_EXTERN gboolean success; gboolean success = FALSE; static void _vala_main (void); -static void ___lambda4_ (gchar* s); -static void ____lambda4__gfunc (gpointer data, - gpointer self); +static void _vala_lambda0_ (gchar* s); +static void __vala_lambda0__gfunc (gpointer data, + gpointer self); static void -___lambda4_ (gchar* s) +_vala_lambda0_ (gchar* s) { gboolean _tmp0_ = FALSE; g_return_if_fail (s != NULL); @@ -46,10 +46,10 @@ ___lambda4_ (gchar* s) } static void -____lambda4__gfunc (gpointer data, - gpointer self) +__vala_lambda0__gfunc (gpointer data, + gpointer self) { - ___lambda4_ ((gchar*) data); + _vala_lambda0_ ((gchar*) data); } static void @@ -63,7 +63,7 @@ _vala_main (void) gchar* _tmp2_; GThreadPool* _tmp3_; gchar* _tmp4_; - _tmp0_ = g_thread_pool_new (____lambda4__gfunc, NULL, 2, TRUE, &_inner_error0_); + _tmp0_ = g_thread_pool_new (__vala_lambda0__gfunc, NULL, 2, TRUE, &_inner_error0_); pool = _tmp0_; if (G_UNLIKELY (_inner_error0_ != NULL)) { goto __catch0_g_error; diff --git a/vala/valalambdaexpression.vala b/vala/valalambdaexpression.vala index be33765f8..62f063631 100644 --- a/vala/valalambdaexpression.vala +++ b/vala/valalambdaexpression.vala @@ -28,8 +28,6 @@ using GLib; * Lambda expressions are anonymous methods with implicitly typed parameters. */ public class Vala.LambdaExpression : Expression { - private static int next_lambda_id = 0; - /** * The expression body of this lambda expression. Only one of * expression_body or statement_body may be set. @@ -151,7 +149,7 @@ public class Vala.LambdaExpression : Expression { var cb = (Delegate) ((DelegateType) target_type).delegate_symbol; var return_type = cb.return_type.get_actual_type (target_type, null, this); - method = new Method ("_lambda%d_".printf (next_lambda_id++), return_type, source_reference); + method = new Method ("@lambda", return_type, source_reference); // track usage for flow analyzer method.used = true; |