Changeset 1638 for code/branches/gui/src/util/ArgReader.h

Timestamp:

Jul 20, 2008, 7:49:26 PM (16 years ago)

Author:

rgrieder

Message:

merged input branch into gui test branch (was about time)
svn save (it's still a mess and CMLs haven't been updated)
I'll have to create a special project to create the tolua_bind files for tolua itself anyway..

Location:

code/branches/gui

Files:

• . (modified) (1 prop)
• src/util/ArgReader.h (modified) (2 diffs)

code/branches/gui/src/util/ArgReader.h

@@ -22 +22 @@
  *   Author:
  *      Reto Grieder
+ *      Benjamin Knecht <beni_at_orxonox.net>
  *   Co-authors:
- *      Benjamin Knecht <beni_at_orxonox.net>
+ *      ...
  *
  */
@@ -42 +43 @@
 #include "Convert.h"
 
-struct _UtilExport CmdLineArg
-{
-  std::string name_;
-  std::string value_;
-  bool bChecked_;
-};
 
 class _UtilExport ArgReader
 {
-  public:
-    ArgReader(int argc, char **argv);
-    template <class T>
-    void checkArgument(std::string option, T* value, bool must = false);
-    bool errorHandling();
-    const std::string& getErrorString();
+public:
+    ArgReader() { }
+    std::string parse(int argc, char **argv);
+    const std::string& getArgument(const std::string& option);
+    bool allChecked();
 
-  private:
+private:
+    struct CmdLineArg
+    {
+        std::string name_;
+        std::string value_;
+        bool bChecked_;
+    };
+
     std::vector<CmdLineArg> arguments_;
-    bool failure_;
-    std::string errorString_;
 };
 
-template <class T>
-void ArgReader::checkArgument(std::string option, T* value, bool must)
-{
-  unsigned int iArg = 0;
-  while (iArg < arguments_.size())
-  {
-    if (arguments_[iArg].name_ == option)
-      break;
-    ++iArg;
-  }
-  if (iArg == arguments_.size())
-  {
-    if (must)
-    {
-      failure_ = true;
-      errorString_ += "Cannot find mandatory argument \"" + option + "\"\n";
-      return;
-    }
-    else
-      return;
-  }
-
-  arguments_[iArg].bChecked_ = true;
-
-  if (!convertValue(value, arguments_[iArg].value_))
-  {
-    failure_ = true;
-    errorString_ += "Cannot convert argument value for option \"" + option + "\"\n";
-  }
-}
-
-template <>
-void ArgReader::checkArgument(std::string option, bool* value, bool must)
-{
-  // for type bool, only check whether the option was set or not
-  unsigned int iArg = 0;
-  while (iArg < arguments_.size())
-  {
-    if (arguments_[iArg].name_ == option)
-    {
-      arguments_[iArg].bChecked_ = true;
-      *value = true;
-      break;
-    }
-    ++iArg;
-  }
-  if (iArg == arguments_.size())
-    *value = false;
-}
-
 #endif /* _ArgReader_H__ */