Merge branch 'master' into redesign-1.0

Author: nader-zouaoui

parser-tests/parser-tests.cpp

@@ -109,7 +109,6 @@ namespace parsertests
             int argc = 5;
             mock_arg_parser parser;
             parser.parse(argc, argv);
-
             Assert::IsTrue(parser.do_record.is_set());
             Assert::IsTrue(check_value_in_vector(parser.double_dash.get_values(), L"notepad.exe"));
             Assert::IsTrue(COMMAND_CLASS::RECORD == parser.m_command);

parser/arg-parser.cpp

@@ -49,6 +49,14 @@ void arg_parser::parse(
         raw_args.push_back(argv[i]);
         m_arg_array.push_back(argv[i]);
     }
+    try_match_and_set_arg(raw_args, do_list);
+    try_match_and_set_arg(raw_args, do_help);
+    try_match_and_set_arg(raw_args, do_version);
+    try_match_and_set_arg(raw_args, do_test);
+    try_match_and_set_arg(raw_args, do_detect);
+    try_match_and_set_arg(raw_args, do_sample);
+    try_match_and_set_arg(raw_args, do_record);
+    try_match_and_set_arg(raw_args, do_count);
 
     if (raw_args.size() == 0)
         throw_invalid_arg(L"", L"warning: No arguments were found!");
@@ -59,6 +67,7 @@ void arg_parser::parse(
         if (command->parse(raw_args)) {
             m_command = command->m_command;
             raw_args.erase(raw_args.begin());
+
             break;
         }
     }
@@ -90,6 +99,7 @@ void arg_parser::parse(
         {
             throw_invalid_arg(raw_args.front(), L"Error: Unrecognized command");
         }
+
     }
 }
 

parser/arg-parser.h

@@ -43,6 +43,7 @@ using namespace std;
 
 
 typedef std::vector<std::wstring> wstr_vec;
+
 enum COMMAND_CLASS {
     STAT,
     SAMPLE,
@@ -55,6 +56,13 @@ enum COMMAND_CLASS {
     MAN,
     NO_COMMAND
 };
+static const std::set<COMMAND_CLASS> commands_with_events_and_metrics = { 
+    COMMAND_CLASS::STAT, 
+    COMMAND_CLASS::SAMPLE, 
+    COMMAND_CLASS::RECORD,
+    COMMAND_CLASS::TIMELINE,
+    COMMAND_CLASS::SPE 
+};
 
 class arg_parser_arg_command : public arg_parser_arg_opt {
 public:
@@ -210,6 +218,7 @@ class arg_parser
         {}
     );
 
+
 #pragma endregion
 
 #pragma region Flags with arguments
@@ -393,5 +402,4 @@ class arg_parser
 protected:
     void throw_invalid_arg(const std::wstring& arg, const std::wstring& additional_message = L"") const;
 #pragma endregion
-
 };