Add a test for mixed types of arguments, fix declaration order problems.

Seriously, C++, this is just silly :/
griwes · Mar 29, 2015 · e086493 · e086493
1 parent 2b4bfa8
commit e086493
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/include/reaver/configuration/options.h b/include/reaver/configuration/options.h
@@ -429,23 +429,32 @@ namespace reaver
                 return desc;
             }
 
+            template<typename... Args, typename Config>
+            auto _get(boost::program_options::variables_map & map, Config && config);
+
             template<typename Config>
-            auto _get(boost::program_options::variables_map & map, Config && config)
+            auto _get_impl(boost::program_options::variables_map & map, Config && config)
             {
                 return std::forward<Config>(config);
             }
 
             template<typename Head, typename... Tail, typename Config, typename std::enable_if<Head::is_void, int>::type = 0>
-            auto _get(boost::program_options::variables_map & map, Config && config)
+            auto _get_impl(boost::program_options::variables_map & map, Config && config)
             {
                 return _get<Tail...>(map, std::forward<Config>(config).template add<Head>(map.count(_name(Head::name))));
             }
 
             template<typename Head, typename... Tail, typename Config, typename std::enable_if<!Head::is_void, int>::type = 0>
-            auto _get(boost::program_options::variables_map & map, Config && config)
+            auto _get_impl(boost::program_options::variables_map & map, Config && config)
             {
                 return _get<Tail...>(map, std::forward<Config>(config).template add<Head>(map[_name(Head::name)].template as<typename Head::type>()));
             }
+
+            template<typename... Args, typename Config>
+            auto _get(boost::program_options::variables_map & map, Config && config)
+            {
+                return _get_impl<Args...>(map, std::forward<Config>(config));
+            }
         }
 
         template<typename... Args>

diff --git a/tests/options.cpp b/tests/options.cpp
@@ -132,6 +132,19 @@ MAYFLY_ADD_TESTCASE("multiple positional", []
 
 // TODO: need checks for static asserts in positional comparator (checking for overlapping "regions" of positional arguments)
 
+MAYFLY_ADD_TESTCASE("mixed arguments", []
+{
+    const char * argv[] = { "", "upgrade", "--version", "--count", "5", "456", "--output", "foo", "--help" };
+    auto parsed = test::reaver::options::parse_argv(9, argv, test::reaver::id<command>{}, test::reaver::id<value>{}, test::reaver::id<help>{}, test::reaver::id<version>{},
+        test::reaver::id<output>{}, test::reaver::id<count>{});
+    MAYFLY_REQUIRE(parsed.get<command>() == "upgrade");
+    MAYFLY_REQUIRE(parsed.get<value>() == 456);
+    MAYFLY_REQUIRE(parsed.get<help>());
+    MAYFLY_REQUIRE(parsed.get<version>());
+    MAYFLY_REQUIRE(parsed.get<output>() == "foo");
+    MAYFLY_REQUIRE(parsed.get<count>() == 5);
+});
+
 MAYFLY_END_SUITE;
 MAYFLY_END_SUITE;