Changes in src/CommandLineParser.cpp [112b09:7e6b00]

File:

• src/CommandLineParser.cpp (modified) (3 diffs)

src/CommandLineParser.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
 #include <boost/program_options.hpp>
 #include <fstream>
 #include <iostream>
+#include <map>
 
 #include "Patterns/Singleton_impl.hpp"
 #include "CommandLineParser.hpp"
+#include "log.hpp"
+#include "verbose.hpp"
 
 using namespace std;
@@ -47 +48 @@
 }
 
+/** Scan the argument list for -a or --arguments and store their order for later use.
+ * \param &ShortFormToActionMap e.g. gives "help" for "h"
+ */
+void CommandLineParser::scanforSequenceOfArguments(map <std::string, std::string> &ShortFormToActionMap)
+{
+  // go through all arguments
+  for (int i=1;i<argc;i++) {
+    (cout << Verbose(1) << "Checking on " << argv[i] << endl);
+    // check whether they begin with - or -- and check that next letter is not numeric, if so insert
+    if (argv[i][0] == '-') {
+      (cout << Verbose(1) << "Possible argument: " << argv[i] << endl);
+      if (argv[i][1] == '-') {
+        (cout << Verbose(1) << "Putting " << argv[i] << " into the sequence." << endl);
+        SequenceOfActions.push_back(&(argv[i][2]));
+      } else if (((argv[i][1] < '0') || (argv[i][1] > '9')) && ((argv[i][1] != '.'))) {
+        map <std::string, std::string>::iterator iter = ShortFormToActionMap.find(&(argv[i][1]));
+        if (iter != ShortFormToActionMap.end()) {
+          (cout << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
+          SequenceOfActions.push_back(iter->second);
+        }
+      }
+    }
+  }
+}
 
 
@@ -74 +99 @@
  * \param **_argv argument array from main()
  */
-void CommandLineParser::Run(int _argc, char **_argv)
+void CommandLineParser::Run(int _argc, char **_argv, map <std::string, std::string> &ShortFormToActionMap)
 {
   setOptions(_argc,_argv);
   Parse();
+  scanforSequenceOfArguments(ShortFormToActionMap);
 }