diff options
Diffstat (limited to 'tests/delegates')
-rw-r--r-- | tests/delegates/bug639751.c-expected | 12 | ||||
-rw-r--r-- | tests/delegates/bug659778.c-expected | 40 | ||||
-rw-r--r-- | tests/delegates/bug703804.c-expected | 12 | ||||
-rw-r--r-- | tests/delegates/bug761360.c-expected | 16 | ||||
-rw-r--r-- | tests/delegates/bug792077.c-expected | 40 | ||||
-rw-r--r-- | tests/delegates/class-field-initializer.c-expected | 12 | ||||
-rw-r--r-- | tests/delegates/delegates.c-expected | 12 | ||||
-rw-r--r-- | tests/delegates/implicit-local-variable.c-expected | 20 | ||||
-rw-r--r-- | tests/delegates/lambda-mixed-instance-static.c-expected | 30 | ||||
-rw-r--r-- | tests/delegates/lambda-shared-closure.c-expected | 176 | ||||
-rw-r--r-- | tests/delegates/reference_transfer.c-expected | 12 |
11 files changed, 191 insertions, 191 deletions
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); } |