[WIP] argparse

Author: toroidal-code

include/argparse.hpp

@@ -3,10 +3,13 @@
 #include <argparse/argparse.hpp>
 #include <string_view>
 
-#include "argparse.hpp"
-#include "formatters/formatters_base.hpp"
+#include "formatters/progress.hpp"
+#include "formatters/tap.hpp"
+#include "formatters/verbose.hpp"
+
 
 namespace CppSpec {
+
 constexpr std::string file_name(std::string_view path) {
   std::string_view file = path;
   for (size_t i = 0; i < path.size(); ++i) {
@@ -17,15 +20,9 @@ constexpr std::string file_name(std::string_view path) {
   return std::string{file};
 }
 
-enum class Formatter {
-  Progress,
-  TAP,
-  Detail
-};
-
 struct RuntimeOpts {
   bool verbose = false;
-  Formatter format = Formatter::Progress;
+  std::unique_ptr<Formatters::BaseFormatter> formatter = nullptr;
 };
 
 inline RuntimeOpts parse(int argc, char** argv) {
@@ -55,13 +52,18 @@ inline RuntimeOpts parse(int argc, char** argv) {
     opts.verbose = true;
   }
 
-  auto format_string  = program.get<std::string>("--format");
+  auto format_string = program.get<std::string>("--format");
   if (format_string == "p" || format_string == "progress") {
-    opts.format = Formatter::Progress;
+    opts.formatter = std::make_unique<Formatters::Progress>();
   } else if (format_string == "t" || format_string == "tap") {
-    opts.format = Formatter::TAP;
+    opts.formatter = std::make_unique<Formatters::TAP>();
   } else if (format_string == "d" || format_string == "detail") {
-    opts.format = Formatter::Detail;
+    opts.formatter = std::make_unique<Formatters::Verbose>();
+  } else {
+    std::cerr << "Unrecognized format type" << std::endl;
+    std::exit(-1);
   }
+
+  return opts;
 }
 }  // namespace CppSpec

include/formatters/verbose.hpp

@@ -6,11 +6,11 @@
 #include <list>
 #include <string>
 
+#include "argparse.hpp"
 #include "class_description.hpp"
 #include "formatters_base.hpp"
 #include "it_base.hpp"
 
-
 namespace CppSpec {
 namespace Formatters {
 
@@ -70,12 +70,12 @@ static Verbose verbose;
 
 }  // namespace Formatters
 
-template <typename Formatter = Formatters::Verbose>
-inline auto Description::as_main()  {
+template <typename FormatterType = Formatters::Verbose>
+inline auto Description::as_main() {
   Description description{*this};
-  return [=](int argc, char** argv) mutable -> int {
-    Formatter f{};
-    return description.run(f) ? EXIT_SUCCESS : EXIT_FAILURE;
+  return [=](int argc, char **argv) mutable -> int {
+    auto opts = parse(argc, argv);
+    return description.run(*opts.formatter) ? EXIT_SUCCESS : EXIT_FAILURE;
   };
 }
 }  // namespace CppSpec

include/runner.hpp

@@ -6,9 +6,7 @@
 
 #include <list>
 
-#include "formatters/progress.hpp"
-#include "formatters/tap.hpp"
-#include "formatters/verbose.hpp"
+#include "argparse.hpp"
 
 namespace CppSpec {