Skip to content

Commit 272477c

Browse files
committed
Move function-pointer-can-be-null option handling.
Move it to recursive_initialization_configt because it's a common option.
1 parent 49f2e59 commit 272477c

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/goto-harness/function_call_harness_generator.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,6 @@ void function_call_harness_generatort::handle_option(
175175
p_impl->function_parameters_to_treat_as_cstrings.insert(
176176
values.begin(), values.end());
177177
}
178-
else if(option == COMMON_HARNESS_GENERATOR_FUNCTION_POINTER_CAN_BE_NULL_OPT)
179-
{
180-
std::transform(
181-
values.begin(),
182-
values.end(),
183-
std::inserter(
184-
p_impl->recursive_initialization_config
185-
.potential_null_function_pointers,
186-
p_impl->recursive_initialization_config.potential_null_function_pointers
187-
.end()),
188-
[](const std::string &opt) -> irep_idt { return irep_idt{opt}; });
189-
}
190178
else
191179
{
192180
throw invalid_command_line_argument_exceptiont{

src/goto-harness/recursive_initialization.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Author: Diffblue Ltd.
2121
#include <util/string2int.h>
2222

2323
#include <functional>
24+
#include <iterator>
2425

2526
bool recursive_initialization_configt::handle_option(
2627
const std::string &option,
@@ -74,6 +75,17 @@ bool recursive_initialization_configt::handle_option(
7475
COMMON_HARNESS_GENERATOR_MIN_ARRAY_SIZE_OPT, values);
7576
return true;
7677
}
78+
else if(option == COMMON_HARNESS_GENERATOR_FUNCTION_POINTER_CAN_BE_NULL_OPT)
79+
{
80+
std::transform(
81+
values.begin(),
82+
values.end(),
83+
std::inserter(
84+
potential_null_function_pointers,
85+
potential_null_function_pointers.end()),
86+
[](const std::string &opt) -> irep_idt { return irep_idt{opt}; });
87+
return true;
88+
}
7789
return false;
7890
}
7991

0 commit comments

Comments
 (0)