Changeset 125 in SHVCSoftware for trunk/source/Lib/TAppCommon

Timestamp:

16 Apr 2013, 06:39:31 (12 years ago)

Author:

seregin

Message:

copy from HM-10.0-dev-SHM

Location:

trunk/source/Lib/TAppCommon

Files:

• program_options_lite.cpp (modified) (1 diff)
• program_options_lite.h (modified) (5 diffs)

trunk/source/Lib/TAppCommon/program_options_lite.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *

trunk/source/Lib/TAppCommon/program_options_lite.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <list>
 #include <map>
-#include "TLibCommon/TypeDef.h"
 
 //! \ingroup TAppCommon
@@ -48 +47 @@
     struct Options;
     
+    struct ParseFailure : public std::exception
+    {
+      ParseFailure(std::string arg0, std::string val0) throw()
+      : arg(arg0), val(val0)
+      {}
+
+      ~ParseFailure() throw() {};
+
+      std::string arg;
+      std::string val;
+
+      const char* what() const throw() { return "Option Parse Failure"; }
+    };
+
     void doHelp(std::ostream& out, Options& opts, unsigned columns = 80);
     unsigned parseGNU(Options& opts, unsigned argc, const char* argv[]);
@@ -103 +116 @@
     {
       std::istringstream arg_ss (arg,std::istringstream::in);
-      arg_ss >> opt_storage;
+      arg_ss.exceptions(std::ios::failbit);
+      try
+      {
+        arg_ss >> opt_storage;
+      }
+      catch (...)
+      {
+        throw ParseFailure(opt_string, arg);
+      }
     }
     
@@ -208 +229 @@
           if(pos != std::string::npos)
             cNameBuffer.resize(pos);
-
+      
           parent.addOption(new Option<T>( cNameBuffer, (storage[uiK]), default_val, cDescriptionBuffer ));
         }