Add boolean constructor to options structure

Author: Sonny Martin

src/goto-programs/validate_goto_model.h

@@ -31,24 +31,14 @@ struct goto_model_validation_optionst
   {
   }
 
-  void disable_all_checks()
+  goto_model_validation_optionst(bool options_value)
+    : entry_point_exists{options_value},
+      function_pointer_calls_removed{options_value},
+      check_returns_removed{options_value},
+      check_called_functions{options_value},
+      check_last_instruction{options_value},
+      check_sourcecode_location{options_value}
   {
-    entry_point_exists = false;
-    function_pointer_calls_removed = false;
-    check_returns_removed = false;
-    check_called_functions = false;
-    check_last_instruction = false;
-    check_sourcecode_location = false;
-  }
-
-  void enable_all_checks()
-  {
-    entry_point_exists = true;
-    function_pointer_calls_removed = true;
-    check_returns_removed = true;
-    check_called_functions = true;
-    check_last_instruction = true;
-    check_sourcecode_location = true;
   }
 };
 

unit/goto-programs/goto_program_validate.cpp

@@ -115,6 +115,7 @@ SCENARIO("validate goto program")
 
     THEN("fail!")
     {
+      goto_model_validation_optionst validation_options{false};
       validation_options.entry_point_exists = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -130,6 +131,7 @@ SCENARIO("validate goto program")
     goto_convert(goto_model, null_message_handler);
     THEN("pass!")
     {
+      goto_model_validation_optionst validation_options{false};
       validation_options.entry_point_exists = true;
       REQUIRE_NOTHROW(validate_goto_model(
         goto_model.goto_functions,
@@ -161,6 +163,7 @@ SCENARIO("validate goto program")
 
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.function_pointer_calls_removed = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -177,6 +180,7 @@ SCENARIO("validate goto program")
     {
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.function_pointer_calls_removed = true;
       REQUIRE_NOTHROW(validate_goto_model(
         goto_model.goto_functions,
@@ -198,6 +202,7 @@ SCENARIO("validate goto program")
       auto it = function_map.find("f");
       it->second.type.return_type() = signedbv_typet{32};
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_returns_removed = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -225,6 +230,7 @@ SCENARIO("validate goto program")
       auto &instructions = it->second.body.instructions;
       instructions.insert(instructions.begin(), instruction);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_returns_removed = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -263,6 +269,7 @@ SCENARIO("validate goto program")
     {
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_returns_removed = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -279,6 +286,7 @@ SCENARIO("validate goto program")
     {
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_returns_removed = true;
       REQUIRE_NOTHROW(validate_goto_model(
         goto_model.goto_functions,
@@ -299,6 +307,7 @@ SCENARIO("validate goto program")
       auto it = function_map.find("g");
       function_map.erase(it);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_called_functions = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -319,6 +328,7 @@ SCENARIO("validate goto program")
       auto it = function_map.find("f");
       function_map.erase(it); // f is no longer in function map
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_called_functions = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -337,6 +347,7 @@ SCENARIO("validate goto program")
     {
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_called_functions = true;
       REQUIRE_NOTHROW(validate_goto_model(
         goto_model.goto_functions,
@@ -356,6 +367,7 @@ SCENARIO("validate goto program")
       it->second.body.instructions.erase(
         std::prev(it->second.body.instructions.end()));
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_last_instruction = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -372,6 +384,7 @@ SCENARIO("validate goto program")
     {
       goto_convert(goto_model, null_message_handler);
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_last_instruction = true;
       REQUIRE_NOTHROW(validate_goto_model(
         goto_model.goto_functions,
@@ -392,6 +405,7 @@ SCENARIO("validate goto program")
         it->second.body.instructions.front().code.source_location();
       source_location.make_nil();
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_sourcecode_location = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(
@@ -414,6 +428,7 @@ SCENARIO("validate goto program")
         it->second.body.instructions.front().source_location;
       source_location.make_nil();
 
+      goto_model_validation_optionst validation_options{false};
       validation_options.check_sourcecode_location = true;
       REQUIRE_THROWS_AS(
         validate_goto_model(