@@ -23,7 +23,7 @@ struct lambda_assignment_test_datat
23
23
irep_idt lambda_function_id;
24
24
25
25
std::vector<exprt> expected_params;
26
- bool should_return_value;
26
+ bool should_return_value = true ;
27
27
};
28
28
29
29
// / Verifies for a given function that contains:
@@ -43,12 +43,12 @@ struct lambda_assignment_test_datat
43
43
// / \param symbol_table: The loaded symbol table
44
44
// / \param instructions: The instructions of the method that calls invokedynamic
45
45
// / \param test_data: The parameters for the test
46
- void validate_lamdba_assignement (
46
+ void validate_lambda_assignment (
47
47
const symbol_tablet &symbol_table,
48
48
const std::vector<codet> &instructions,
49
49
const lambda_assignment_test_datat &test_data,
50
50
const require_goto_statements::pointer_assignment_locationt
51
- &lambda_assignment)
51
+ &lambda_assignment)
52
52
{
53
53
const typecast_exprt &rhs_value = require_expr::require_typecast (
54
54
lambda_assignment.non_null_assignments [0 ].rhs ());
@@ -188,7 +188,7 @@ void validate_local_variable_lambda_assignment(
188
188
REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
189
189
REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
190
190
191
- validate_lamdba_assignement (
191
+ validate_lambda_assignment (
192
192
symbol_table, instructions, test_data, lambda_assignment);
193
193
}
194
194
@@ -261,7 +261,7 @@ SCENARIO(
261
261
std::regex (function_prefix_regex_str + R"( ::\d+::paramLambda$)" ));
262
262
}
263
263
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 "
265
265
" array parameter interface implementor" )
266
266
{
267
267
lambda_assignment_test_datat test_data;
@@ -354,6 +354,8 @@ SCENARIO(
354
354
});
355
355
}
356
356
357
+ // / Find the assignment to the lambda in the constructor
358
+ // / and then call validate_lamdba_assignement for full validation.
357
359
void validate_member_variable_lambda_assignment (
358
360
const symbol_tablet &symbol_table,
359
361
const std::vector<codet> &instructions,
@@ -367,7 +369,7 @@ void validate_member_variable_lambda_assignment(
367
369
REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
368
370
REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
369
371
370
- validate_lamdba_assignement (
372
+ validate_lambda_assignment (
371
373
symbol_table, instructions, test_data, lambda_assignment);
372
374
}
373
375
@@ -433,7 +435,7 @@ SCENARIO(
433
435
symbol_table, instructions, test_data, " paramLambda" );
434
436
}
435
437
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 "
437
439
" array parameter interface implementor" )
438
440
{
439
441
lambda_assignment_test_datat test_data;
@@ -509,6 +511,8 @@ SCENARIO(
509
511
});
510
512
}
511
513
514
+ // / Find the assignment to the lambda in the <clinit> and then call
515
+ // / validate_lamdba_assignement for full validation.
512
516
void validate_static_member_variable_lambda_assignment (
513
517
const symbol_tablet &symbol_table,
514
518
const std::vector<codet> &instructions,
@@ -522,7 +526,7 @@ void validate_static_member_variable_lambda_assignment(
522
526
REQUIRE (lambda_assignment.non_null_assignments .size () == 1 );
523
527
REQUIRE_FALSE (lambda_assignment.null_assignment .has_value ());
524
528
525
- validate_lamdba_assignement (
529
+ validate_lambda_assignment (
526
530
symbol_table, instructions, test_data, lambda_assignment);
527
531
}
528
532
@@ -592,7 +596,7 @@ SCENARIO(
592
596
symbol_table, instructions, test_data, " paramLambda" );
593
597
}
594
598
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 "
596
600
" array parameter interface implementor" )
597
601
{
598
602
lambda_assignment_test_datat test_data;
0 commit comments