From 8d7e4b7a1e5881dd5b93a99a1ec3ee8529d67f35 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 6 Apr 2023 15:14:52 +0200 Subject: codegen: Stabilize CCode.cname for backing method of lamdba expression Move lambda_id generation to CCodeAttribute and use _vala_lambda%d_ pattern --- tests/methods/closures.c-expected | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'tests/methods/closures.c-expected') 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_; -- cgit v1.2.1