@@ -23,7 +23,7 @@ struct lambda_assignment_test_datat
2323 irep_idt lambda_function_id;
2424
2525 std::vector<exprt> expected_params;
26- bool should_return_value;
26+ bool should_return_value = true ;
2727};
2828
2929// / Verifies for a given function that contains:
@@ -43,12 +43,12 @@ struct lambda_assignment_test_datat
4343// / \param symbol_table: The loaded symbol table
4444// / \param instructions: The instructions of the method that calls invokedynamic
4545// / \param test_data: The parameters for the test
46- void validate_lamdba_assignement (
46+ void validate_lambda_assignment (
4747 const symbol_tablet &symbol_table,
4848 const std::vector<codet> &instructions,
4949 const lambda_assignment_test_datat &test_data,
5050 const require_goto_statements::pointer_assignment_locationt
51- &lambda_assignment)
51+ &lambda_assignment)
5252{
5353 const typecast_exprt &rhs_value = require_expr::require_typecast (
5454 lambda_assignment.non_null_assignments [0 ].rhs ());
@@ -188,7 +188,7 @@ void validate_local_variable_lambda_assignment(
188188 REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
189189 REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
190190
191- validate_lamdba_assignement (
191+ validate_lambda_assignment (
192192 symbol_table, instructions, test_data, lambda_assignment);
193193}
194194
@@ -261,7 +261,7 @@ SCENARIO(
261261 std::regex (function_prefix_regex_str + R"( ::\d+::paramLambda$)" ));
262262 }
263263 THEN (
264- " The local variable should be assigned a non-null pointer to a "
264+ " The local variable should be assigned a non-null pointer to an "
265265 " array parameter interface implementor" )
266266 {
267267 lambda_assignment_test_datat test_data;
@@ -354,6 +354,8 @@ SCENARIO(
354354 });
355355}
356356
357+ // / Find the assignment to the lambda in the constructor
358+ // / and then call validate_lamdba_assignement for full validation.
357359void validate_member_variable_lambda_assignment (
358360 const symbol_tablet &symbol_table,
359361 const std::vector<codet> &instructions,
@@ -367,7 +369,7 @@ void validate_member_variable_lambda_assignment(
367369 REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
368370 REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
369371
370- validate_lamdba_assignement (
372+ validate_lambda_assignment (
371373 symbol_table, instructions, test_data, lambda_assignment);
372374}
373375
@@ -433,7 +435,7 @@ SCENARIO(
433435 symbol_table, instructions, test_data, " paramLambda" );
434436 }
435437 THEN (
436- " The local variable should be assigned a non-null pointer to a "
438+ " The local variable should be assigned a non-null pointer to an "
437439 " array parameter interface implementor" )
438440 {
439441 lambda_assignment_test_datat test_data;
@@ -509,6 +511,8 @@ SCENARIO(
509511 });
510512}
511513
514+ // / Find the assignment to the lambda in the <clinit> and then call
515+ // / validate_lamdba_assignement for full validation.
512516void validate_static_member_variable_lambda_assignment (
513517 const symbol_tablet &symbol_table,
514518 const std::vector<codet> &instructions,
@@ -522,7 +526,7 @@ void validate_static_member_variable_lambda_assignment(
522526 REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
523527 REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
524528
525- validate_lamdba_assignement (
529+ validate_lambda_assignment (
526530 symbol_table, instructions, test_data, lambda_assignment);
527531}
528532
@@ -592,7 +596,7 @@ SCENARIO(
592596 symbol_table, instructions, test_data, " paramLambda" );
593597 }
594598 THEN (
595- " The local variable should be assigned a non-null pointer to a "
599+ " The local variable should be assigned a non-null pointer to an "
596600 " array parameter interface implementor" )
597601 {
598602 lambda_assignment_test_datat test_data;
0 commit comments