Update ci

gen740 · Dec 7, 2023 · f4b9703 · f4b9703
1 parent f9902c8
commit f4b9703
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 49 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,6 +21,8 @@ jobs:
           brew update
           brew unlink node@18 || echo "nod@18 no such keg"
           brew unlink [email protected] || echo "[email protected] no such keg"
+          brew install node@18 --force
+          brew install [email protected] --force
           brew upgrade
 
       - name: Install llvm

diff --git a/Argo/ArgoParserImpl.cc b/Argo/ArgoParserImpl.cc
@@ -344,7 +344,12 @@ auto Parser<ID, Args, PArgs, HArg, SubParsers>::formatHelp(bool no_color) const
 
   assert(this->info_);  // this->info_ cannot be nullptr
 
-  auto help_info = HelpGenerator<tuple_append_t<Args, HArg>>::generate();
+  std::vector<ArgInfo> help_info;
+  if constexpr (std::is_same_v<HArg, void>) {
+    help_info = HelpGenerator<Args>::generate();
+  } else {
+    help_info = HelpGenerator<tuple_append_t<Args, HArg>>::generate();
+  }
   auto sub_commands = SubParserInfo(subParsers);
 
   if (this->info_->help) {

diff --git a/tests/parser.cc b/tests/parser.cc
@@ -36,12 +36,9 @@ TEST(ArgoTest, EqualAssign) {
 TEST(ArgoTest, FlagArgument) {
   auto [argc, argv] = createArgcArgv(  //
       "./main",                        //
-      "--arg1",
-      "--arg2=true",
+      "--arg1", "--arg2=true",
       "--arg3=1",  //
-      "--arg4",
-      "true",
-      "--arg5",
+      "--arg4", "true", "--arg5",
       "1"  //
   );
 
@@ -86,8 +83,7 @@ TEST(ArgoTest, ShortArgument) {
 
 TEST(ArgoTest, CombiningFlags) {
   auto [argc, argv] = createArgcArgv(  //
-      "./main",
-      "-abd",
+      "./main", "-abd",
       "-e"  //
   );
 
@@ -109,8 +105,7 @@ TEST(ArgoTest, CombiningFlags) {
 
 TEST(ArgoTest, CombiningFlagsWithOptionalArg) {
   auto [argc, argv] = createArgcArgv(  //
-      "./main",
-      "-abdc",
+      "./main", "-abdc",
       "Hello,World"  //
   );
 
@@ -131,8 +126,7 @@ TEST(ArgoTest, CombiningFlagsWithOptionalArg) {
 TEST(ArgoTest, Validation) {
   {
     auto [argc, argv] = createArgcArgv(  //
-        "./main",
-        "--arg",
+        "./main", "--arg",
         "42"  //
     );
 
@@ -146,8 +140,7 @@ TEST(ArgoTest, Validation) {
   }
   {
     auto [argc, argv] = createArgcArgv(  //
-        "./main",
-        "--arg",
+        "./main", "--arg",
         "121"  //
     );
 
@@ -191,20 +184,12 @@ TEST(ArgoTest, Narg) {
   {
     auto [argc, argv] = createArgcArgv(  //
         "./main",                        //
-        "--arg1",
-        "1",
-        "2",
+        "--arg1", "1", "2",
         "3",       //
         "--arg2",  //
-        "--arg3",
-        "6.0",
-        "7.2",
-        "8.4",
+        "--arg3", "6.0", "7.2", "8.4",
         "9.6",  //
-        "--arg4",
-        "11",
-        "12",
-        "8",
+        "--arg4", "11", "12", "8",
         "9"  //
     );
 
@@ -269,31 +254,33 @@ TEST(ArgoTest, NargException) {
   }
 }
 
-// TEST(ArgoTest, Help) {  // TODO(gen740): more help
-//   {
-//     auto argo = Argo::Parser<"Help 1">("program");
-//     auto parser = argo  //
-//                       .addArg<"arg0,k", int>()
-//                       .addArg<"arg1,a", int, Argo::nargs('+')>()
-//                       .addArg<"arg2", int,
-//                       Argo::nargs('+')>(Argo::description("This is arg2"));
-//
-//     auto expect_help = R"(Options:
-//   -k, --arg0
-//   -a, --arg1
-//       --arg2  This is arg2)";
-//
-//     EXPECT_EQ(parser.formatHelp(false), expect_help);
-//   }
-// }
+TEST(ArgoTest, Help) {  // TODO(gen740): more help
+  {
+    auto argo = Argo::Parser<"Help 1">("program");
+    auto parser = argo  //
+                      .addArg<"arg0,k", int>()
+                      .addArg<"arg1,a", int, Argo::nargs('+')>()
+                      .addArg<"arg2", int, Argo::nargs('+')>(
+                          Argo::description("This is arg2"));
+
+    const auto* expect_help = R"(
+USAGE:
+  program [options...]
+
+Options:
+  -k, --arg0 [<NUMBER>]
+  -a, --arg1 <NUMBER,...>
+      --arg2 <NUMBER,...>  This is arg2)";
+
+    EXPECT_EQ(parser.formatHelp(true), expect_help);
+  }
+}
 
 TEST(ArgoTest, Required) {
   {
     auto [argc, argv] = createArgcArgv(  //
         "./main",                        //
-        "--arg1",
-        "1",
-        "--arg2",
+        "--arg1", "1", "--arg2",
         "2"  //
     );
 
@@ -309,14 +296,11 @@ TEST(ArgoTest, Required) {
   }
 }
 
-
 TEST(ArgoTest, IsAssigned) {
   {
     auto [argc, argv] = createArgcArgv(  //
         "./main",                        //
-        "--arg1",
-        "42",
-        "--arg2",
+        "--arg1", "42", "--arg2",
         "--arg4"  //
     );