Change option lists to be specified as separate arguments on commands line

Option lists and maps are specified using separate arguments, avoiding
the need for additional escaping of their separator and reusing the
existing command line spliting logic instead.

As discussed on #2087, this should make it much easier to work with
list options, and make the general option system feel cleaner.

1 files changed, 27 insertions, 0 deletions

diff --git a/src/option.hh b/src/option.hh
index f4aafe3a..19ca709f 100644
--- a/src/option.hh
+++ b/src/option.hh
@@ -16,6 +16,33 @@ inline String option_to_string(int opt);
 inline String option_to_string(size_t opt);
 inline String option_to_string(bool opt);
 
+// Default fallback to single value functions
+template<typename T>
+decltype(option_from_string(Meta::Type<T>{}, StringView{}))
+option_from_strings(Meta::Type<T>, ConstArrayView<String> strs)
+{
+    if (strs.size() != 1)
+        throw runtime_error("expected a single value for option");
+    return option_from_string(Meta::Type<T>{}, strs[0]);
+}
+
+template<typename T>
+Vector<decltype(option_to_string(std::declval<T>()))>
+option_to_strings(const T& opt)
+{
+    return Vector<String>{option_to_string(opt)};
+}
+
+template<typename T>
+decltype(option_add(std::declval<T>(), std::declval<String>()))
+option_add_from_strings(T& opt, ConstArrayView<String> strs)
+{
+    if (strs.size() != 1)
+        throw runtime_error("expected a single value for option");
+    return option_add(opt, strs[0]);
+}
+
+
 template<typename P, typename T>
 struct PrefixedList
 {