Arguments parsing in separated class.

astand · astand · commit 92d1b9479f48 · 2022-07-20T23:39:22.000+03:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,6 +18,7 @@ add_executable(coderdbc
     ${CMAKE_CURRENT_SOURCE_DIR}/helpers/formatter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parser/dbclineparser.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parser/dbcscanner.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/options-parser.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/app.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/maincli.cpp
 )
@@ -37,6 +38,7 @@ enable_testing()
 
 add_executable(
   cctest
+  ${CMAKE_CURRENT_SOURCE_DIR}/options-parser.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/tests/args-test.cpp
 )
 
diff --git a/src/app.h b/src/app.h
@@ -3,10 +3,11 @@
 #include <stdint.h>
 #include <vector>
 #include <string>
+#include <options-parser.h>
 
 class CoderApp {
  public:
-  CoderApp(const std::vector<std::pair<std::string, std::string>>& params) : Params(params) {}
+  CoderApp(const OptionsParser::Pairs& params) : Params(params) {}
 
   void Run();
 
@@ -21,7 +22,7 @@ class CoderApp {
     bool ok{false};
   } StrParam_t;
 
-  const std::vector<std::pair<std::string, std::string>>& Params;
+  const OptionsParser::Pairs& Params;
 
   StrParam_t dbc{};
   StrParam_t outdir{};
diff --git a/src/maincli.cpp b/src/maincli.cpp
@@ -2,44 +2,12 @@
 #include <stdlib.h>
 #include <memory>
 #include "app.h"
-
-std::vector<std::pair<std::string, std::string>> getoptions(int argc, char** argv)
-{
-  std::vector<std::pair<std::string, std::string>> ret{};
-
-  std::pair<std::string, std::string> pair{};
-
-  if (argc <= 0)
-  {
-    return ret;
-  }
-
-  for (int i = 0; i < argc; i++)
-  {
-    // key found (must start with '-' (e.g. '-dbc'))
-    if (argv[i][0] == '-')
-    {
-      pair.first = std::string(argv[i]);
-      pair.second.clear();
-
-      if ((i + 1) < argc && argv[i + 1][0] != '-')
-      {
-        // key param
-        pair.second = std::string(argv[i + 1]);
-        // unlooped i incremention
-        ++i;
-      }
-
-      ret.push_back(pair);
-    }
-  }
-
-  return ret;
-}
+#include "options-parser.h"
 
 int main(int argc, char* argv[])
 {
-  auto opts = getoptions(argc, argv);
+  OptionsParser parser;
+  auto opts = parser.GetOptions(argc, argv);
   auto app = std::make_unique<CoderApp>(opts);
   app->Run();
 }
diff --git a/src/options-parser.cpp b/src/options-parser.cpp
@@ -0,0 +1,35 @@
+#include "options-parser.h"
+
+OptionsParser::Pairs OptionsParser::GetOptions(int argc, char** argv)
+{
+  Pairs ret{};
+
+  OnePair pair{};
+
+  if (argc <= 0)
+  {
+    return ret;
+  }
+
+  for (int i = 0; i < argc; i++)
+  {
+    // key found (must start with '-' (e.g. '-dbc'))
+    if (argv[i][0] == '-')
+    {
+      pair.first = std::string(argv[i]);
+      pair.second.clear();
+
+      if ((i + 1) < argc && argv[i + 1][0] != '-')
+      {
+        // key param
+        pair.second = std::string(argv[i + 1]);
+        // unlooped i incremention
+        ++i;
+      }
+
+      ret.push_back(pair);
+    }
+  }
+
+  return ret;
+}
diff --git a/src/options-parser.h b/src/options-parser.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <stdlib.h>
+#include <string>
+#include <memory>
+#include <vector>
+
+class OptionsParser {
+ public:
+
+  using OnePair = std::pair<std::string, std::string>;
+  using Pairs = std::vector<OnePair>;
+
+  Pairs GetOptions(int argc, char** argv);
+
+};
+
+
diff --git a/src/tests/args-test.cpp b/src/tests/args-test.cpp
@@ -1,6 +1,28 @@
 #include <gtest/gtest.h>
+#include <options-parser.h>
 
 TEST(ArgParserTest, BasicAssert)
 {
+  static char* testchunks[] =
+  {
+    (char*)"appname",
+    (char*)"-out",
+    (char*)"path/to/out",
+    (char*)"-dbc",
+    (char*)"path/to/test.dbc",
+    (char*)"-rw"
+  };
+
+  OptionsParser parser;
+  auto ret = parser.GetOptions(6, testchunks);
+  EXPECT_TRUE(ret.size() == 3);
+
+  EXPECT_EQ(ret[0].first.compare("-out"), 0);
+  EXPECT_EQ(ret[0].second.compare("path/to/out"), 0);
+  EXPECT_EQ(ret[1].first.compare("-dbc"), 0);
+  EXPECT_EQ(ret[1].second.compare("path/to/test.dbc"), 0);
+  EXPECT_EQ(ret[2].first.compare("-rw"), 0);
+  EXPECT_EQ(ret[2].second.size(), 0);
+
   EXPECT_EQ(1, 1);
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ add_executable(coderdbc`
`18`	`18`	`${CMAKE_CURRENT_SOURCE_DIR}/helpers/formatter.cpp`
`19`	`19`	`${CMAKE_CURRENT_SOURCE_DIR}/parser/dbclineparser.cpp`
`20`	`20`	`${CMAKE_CURRENT_SOURCE_DIR}/parser/dbcscanner.cpp`
	`21`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/options-parser.cpp`
`21`	`22`	`${CMAKE_CURRENT_SOURCE_DIR}/app.cpp`
`22`	`23`	`${CMAKE_CURRENT_SOURCE_DIR}/maincli.cpp`
`23`	`24`	`)`
`@@ -37,6 +38,7 @@ enable_testing()`
`37`	`38`
`38`	`39`	`add_executable(`
`39`	`40`	`cctest`
	`41`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/options-parser.cpp`
`40`	`42`	`${CMAKE_CURRENT_SOURCE_DIR}/tests/args-test.cpp`
`41`	`43`	`)`
`42`	`44`