remove secondary parser

Author: toroidal-code

CMakeLists.txt

@@ -83,6 +83,7 @@ function(discover_specs spec_folder)
     cmake_path(GET spec PARENT_PATH spec_folder)
 
     if (${output_junit})
+      file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/results/${spec_folder})
       add_spec(${spec} "--output-junit;${CMAKE_CURRENT_BINARY_DIR}/results/${spec_folder}/${spec_name}.xml")
     else()
       add_spec(${spec} "")

include/argparse.hpp

@@ -1,17 +1,9 @@
 #pragma once
 
-#include <string>
-#include <string_view>
-
-#ifdef CPPSPEC_SEMIHOSTED
-#include <sys/stat.h>
-#include <cstring>
-#else
 #include <argparse/argparse.hpp>
-#include <filesystem>
 #include <fstream>
-#endif
-
+#include <string>
+#include <string_view>
 #include "formatters/junit_xml.hpp"
 #include "formatters/progress.hpp"
 #include "formatters/tap.hpp"
@@ -31,31 +23,6 @@ inline std::string file_name(std::string_view path) {
 }
 
 inline Runner parse(int argc, char** const argv) {
-#ifdef CPPSPEC_SEMIHOSTED
-  int i = 0;
-  for (; i < argc; ++i) {
-    if (strcmp(argv[i], "-f") == 0) {
-      break;
-    }
-  }
-  if (i == argc) {
-    return Runner{std::make_shared<Formatters::Progress>()};
-    std::exit(-1);
-  }
-  std::string format_string = argv[i + 1];
-  if (format_string == "d" || format_string == "detail") {
-    return Runner{std::make_shared<Formatters::Verbose>()};
-  } else if (format_string == "p" || format_string == "progress") {
-    return Runner{std::make_shared<Formatters::Progress>()};
-  } else if (format_string == "t" || format_string == "tap") {
-    return Runner{std::make_shared<Formatters::TAP>()};
-  } else if (format_string == "j" || format_string == "junit") {
-    return Runner{std::make_shared<Formatters::JUnitXML>()};
-  } else {
-    std::cerr << "Unrecognized format type" << std::endl;
-    std::exit(-1);
-  }
-#else
   std::filesystem::path executable_path = argv[0];
   std::string executable_name = executable_path.filename().string();
   argparse::ArgumentParser program{executable_name};
@@ -94,16 +61,11 @@ inline Runner parse(int argc, char** const argv) {
 
   auto junit_output_filepath = program.get<std::string>("--output-junit");
   if (!junit_output_filepath.empty()) {
-    // create directories recursively if they don't exist
-    std::filesystem::path junit_output_path = junit_output_filepath;
-    std::filesystem::create_directories(junit_output_path.parent_path());
-
     // open file stream
     auto* file_stream = new std::ofstream(junit_output_filepath);
     auto junit_output = std::make_shared<Formatters::JUnitXML>(*file_stream, false);
     return Runner{formatter, junit_output};
   }
   return Runner{formatter};
-#endif
 }
 }  // namespace CppSpec