Merge pull request #6364 from tautschnig/csv_cleanup

cmdlinet::get_comma_separated_values: re-use split_string

Author: tautschnig

regression/goto-instrument/fp-reachability-slice3/test.desc

@@ -1,6 +1,6 @@
 CORE
 main.c
---fp-reachability-slice b,c
+--fp-reachability-slice b --fp-reachability-slice c
 ^EXIT=0$
 ^SIGNAL=0$
 1 file main.c line 34

src/util/cmdline.cpp

@@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/edit_distance.h>
 #include <util/exception_utils.h>
 #include <util/invariant.h>
+#include <util/string_utils.h>
 
 cmdlinet::cmdlinet()
 {
@@ -120,16 +121,14 @@ std::list<std::string>
 cmdlinet::get_comma_separated_values(const char *option) const
 {
   std::list<std::string> separated_values;
-  auto i = getoptnr(option);
-  if(i.has_value() && !options[*i].values.empty())
+
+  for(const auto &csv : get_values(option))
   {
-    std::istringstream values_stream(options[*i].values.front());
-    std::string single_value;
-    while(std::getline(values_stream, single_value, ','))
-    {
-      separated_values.push_back(single_value);
-    }
+    const auto values = split_string(csv, ',');
+    separated_values.insert(
+      separated_values.end(), values.begin(), values.end());
   }
+
   return separated_values;
 }
 

src/util/cmdline.h

@@ -80,6 +80,8 @@ class cmdlinet
   const std::list<std::string> &get_values(const std::string &option) const;
   const std::list<std::string> &get_values(char option) const;
 
+  /// Collect all occurrences of option \p option and split their values on each
+  /// comma, merging them into a single list of values.
   std::list<std::string> get_comma_separated_values(const char *option) const;
 
   virtual bool isset(char option) const;