Pass command line option to parse_function_pointer_restriction()

Author: danpoe

src/goto-programs/restrict_function_pointers.cpp

@@ -260,7 +260,7 @@ parse_function_pointer_restrictions_from_command_line(
   for(const std::string &restriction_opt : restriction_opts)
   {
     const auto restriction =
-      parse_function_pointer_restriction(restriction_opt);
+      parse_function_pointer_restriction(restriction_opt, "--" + option_name);
 
     const bool inserted = function_pointer_restrictions
                             .emplace(restriction.first, restriction.second)
@@ -298,7 +298,8 @@ function_pointer_restrictionst::parse_function_pointer_restrictions_from_file(
 
 function_pointer_restrictionst::restrictiont
 function_pointer_restrictionst::parse_function_pointer_restriction(
-  const std::string &restriction_opt)
+  const std::string &restriction_opt,
+  const std::string &option)
 {
   // the format for restrictions is <pointer_name>/<target[,more_targets]*>
   // exactly one pointer and at least one target
@@ -311,23 +312,23 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
   {
     throw invalid_command_line_argument_exceptiont{
       "couldn't find '/' in `" + restriction_opt + "'",
-      "--" RESTRICT_FUNCTION_POINTER_OPT,
+      option,
       restriction_format_message};
   }
 
   if(pointer_name_end == restriction_opt.size())
   {
     throw invalid_command_line_argument_exceptiont{
       "couldn't find names of targets after '/' in `" + restriction_opt + "'",
-      "--" RESTRICT_FUNCTION_POINTER_OPT,
+      option,
       restriction_format_message};
   }
 
   if(pointer_name_end == 0)
   {
     throw invalid_command_line_argument_exceptiont{
       "couldn't find target name before '/' in `" + restriction_opt + "'",
-      "--" RESTRICT_FUNCTION_POINTER_OPT};
+      option};
   }
 
   auto const pointer_name = restriction_opt.substr(0, pointer_name_end);
@@ -339,7 +340,7 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
   {
     throw invalid_command_line_argument_exceptiont{
       "missing target list for function pointer restriction " + pointer_name,
-      "--" RESTRICT_FUNCTION_POINTER_OPT,
+      option,
       restriction_format_message};
   }
 
@@ -352,7 +353,7 @@ function_pointer_restrictionst::parse_function_pointer_restriction(
     {
       throw invalid_command_line_argument_exceptiont(
         "leading or trailing comma in restrictions for `" + pointer_name + "'",
-        "--" RESTRICT_FUNCTION_POINTER_OPT,
+        option,
         restriction_format_message);
     }
   }

src/goto-programs/restrict_function_pointers.h

@@ -98,8 +98,9 @@ class function_pointer_restrictionst
     const std::list<std::string> &filenames,
     message_handlert &message_handler);
 
-  static restrictiont
-  parse_function_pointer_restriction(const std::string &restriction_opt);
+  static restrictiont parse_function_pointer_restriction(
+    const std::string &restriction_opt,
+    const std::string &option);
 };
 
 function_pointer_restrictionst get_function_pointer_by_name_restrictions(

unit/goto-programs/restrict_function_pointers.cpp

@@ -23,43 +23,47 @@ void restriction_parsing_test()
 {
   {
     const auto res =
-      fp_restrictionst::parse_function_pointer_restriction("func1/func2");
+      fp_restrictionst::parse_function_pointer_restriction(
+        "func1/func2", "test");
     REQUIRE(res.first == "func1");
     REQUIRE(res.second.size() == 1);
     REQUIRE(res.second.find("func2") != res.second.end());
   }
 
   {
     const auto res =
-      fp_restrictionst::parse_function_pointer_restriction("func1/func2,func3");
+      fp_restrictionst::parse_function_pointer_restriction(
+        "func1/func2,func3", "test");
     REQUIRE(res.first == "func1");
     REQUIRE(res.second.size() == 2);
     REQUIRE(res.second.find("func2") != res.second.end());
     REQUIRE(res.second.find("func3") != res.second.end());
   }
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("func"),
+    fp_restrictionst::parse_function_pointer_restriction("func", "test"),
     invalid_command_line_argument_exceptiont);
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("/func"),
+    fp_restrictionst::parse_function_pointer_restriction("/func", "test"),
     invalid_command_line_argument_exceptiont);
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("func/"),
+    fp_restrictionst::parse_function_pointer_restriction("func/", "test"),
     invalid_command_line_argument_exceptiont);
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("func/,"),
+    fp_restrictionst::parse_function_pointer_restriction("func/,", "test"),
     invalid_command_line_argument_exceptiont);
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("func1/func2,"),
+    fp_restrictionst::parse_function_pointer_restriction(
+      "func1/func2,", "test"),
     invalid_command_line_argument_exceptiont);
 
   REQUIRE_THROWS_AS(
-    fp_restrictionst::parse_function_pointer_restriction("func1/,func2"),
+    fp_restrictionst::parse_function_pointer_restriction(
+      "func1/,func2", "test"),
     invalid_command_line_argument_exceptiont);
 }