Don't bother supporting a filename

2017/12.cpp

@@ -9,8 +9,6 @@
 
 #include <aocpp/Startup.hpp>
 
-using namespace aocpp;
-
 namespace {
 
 auto Parse(std::istream & in)

2017/13.cpp

@@ -9,8 +9,6 @@
 
 #include <aocpp/Startup.hpp>
 
-using namespace aocpp;
-
 namespace {
 
 struct Scanner {

2017/17.cpp

@@ -6,8 +6,6 @@
 
 #include <aocpp/Startup.hpp>
 
-using namespace aocpp;
-
 namespace {
 
 auto Step(std::vector<std::uint32_t> & spin, int steps) -> void {

2019/16.cpp

@@ -7,7 +7,6 @@
 #include <doctest.h>
 
 #include <aocpp/Startup.hpp>
-using namespace aocpp;
 
 namespace {
 

2019/21.cpp

@@ -10,7 +10,6 @@
 #include <aocpp/Startup.hpp>
 #include <intcode/intcode.hpp>
 
-using namespace aocpp;
 using namespace intcode;
 
 namespace {

2019/22.cpp

@@ -7,7 +7,6 @@
 #include <aocpp/Startup.hpp>
 #include <zmod.hpp>
 using namespace zmod;
-using namespace aocpp;
 
 template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
 template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;

2019/25.cpp

@@ -9,7 +9,6 @@
 #include <aocpp/Startup.hpp>
 #include <intcode/intcode.hpp>
 
-using namespace aocpp;
 using namespace intcode;
 
 namespace {

2020/03.cpp

@@ -14,7 +14,6 @@
 #include <aocpp/Grid.hpp>
 #include <aocpp/Coord.hpp>
 
-using aocpp::Startup;
 using aocpp::Coord;
 using aocpp::Grid;
 

2020/21.cpp

@@ -17,7 +17,6 @@
 #include <aocpp/Parsing.hpp>
 #include <dlx.hpp>
 
-using aocpp::Startup;
 using aocpp::SplitOn;
 using dlx::Dlx;
 

2022/13.cpp

@@ -47,7 +47,7 @@ auto ParseTree(std::string::iterator & begin, std::string::iterator end) -> Tree
     switch (*begin++) {
       case ',': goto top;
       case ']': return Tree{std::move(subtrees)};
-      default: assert(false);
+      default: throw std::runtime_error{"bad tree list"};
     }
   } else if (isdigit(*begin)) {
     auto number_end = std::find_if_not(begin, end, isdigit);
@@ -56,7 +56,7 @@ auto ParseTree(std::string::iterator & begin, std::string::iterator end) -> Tree
     std::int64_t number = std::stoll(number_str);
     return Tree{number};
   } else {
-    assert(false);
+    throw std::runtime_error{"bad tree start"};
   }
 }
 

lib/include/aocpp/Startup.hpp

@@ -8,15 +8,6 @@
 #include <memory>
 #include <optional>
 
-namespace aocpp {
-
-/// @brief Return the selected input stream or run the test suite
-/// @param argc Number of arguments
-/// @param argv Command line arguments
-auto Startup(int argc, char ** argv) -> std::unique_ptr<std::istream, void(*)(std::istream*)>;
-
-}
-
 auto Main(std::istream & in, std::ostream & out) -> void;
 
 #endif

lib/src/Startup.cpp

@@ -10,30 +10,14 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include <doctest.h>
 
-namespace aocpp {
-
-auto Startup(int argc, char ** argv) -> std::unique_ptr<std::istream, void(*)(std::istream*)> {
-  if (std::getenv("DOCTEST")) {
-    exit(doctest::Context{argc, argv}.run());
-  }
-
-  switch (argc) {
-    case 2:
-      return {new std::ifstream{argv[1]}, [](std::istream* p) { delete p; }};
-    case 1:
-      return {&std::cin, [](std::istream*){}};
-    default:
-      std::cerr << "bad arguments\n";
-      exit(EXIT_FAILURE);
-  }
-}
-
-}
-
 auto main(int argc, char ** argv) -> int
 {
+  if (std::getenv("DOCTEST")) {
+      return doctest::Context{argc, argv}.run();
+  }
+
   try {
-    Main(*aocpp::Startup(argc, argv), std::cout);
+    Main(std::cin, std::cout);
   } catch (std::exception const& e) {
     std::cerr << "Program failed: " << e.what() << std::endl;
     return 1;