diff options
Diffstat (limited to 'tests/methods')
22 files changed, 340 insertions, 340 deletions
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); } |