Changeset 2407:fb2052c94ebd in lemon-0.x

Timestamp:

03/13/07 16:35:56 (17 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3238

Message:

Using LEMON_ASSERT instead of LogicError?()

File:

• lemon/arg_parser.h (modified) (4 diffs)

lemon/arg_parser.h

@@ -311 +311 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        if(i==_parser._opts.end()) throw LogicError();
-        else if(i->second.type!=ArgParser::BOOL)
-          throw LogicError();
-        else return *(i->second.bool_p);
+        LEMON_ASSERT(i==_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type!=ArgParser::BOOL,
+                     std::string()+"'"+_name+"' is a bool option");
+        return *(i->second.bool_p);
       }
       ///\e
@@ -320 +321 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        if(i==_parser._opts.end()) throw LogicError();
-        else if(i->second.type!=ArgParser::STRING)
-          throw LogicError();
-        else return *(i->second.string_p);
+        LEMON_ASSERT(i==_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type!=ArgParser::STRING,
+                     std::string()+"'"+_name+"' is a string option");
+        return *(i->second.string_p);
       }
       ///\e
@@ -329 +331 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        if(i==_parser._opts.end()) throw LogicError();
-        else if(i->second.type!=ArgParser::DOUBLE) 
-          throw LogicError();
-        else return *(i->second.double_p);
+        LEMON_ASSERT(i==_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type!=ArgParser::DOUBLE,
+                     std::string()+"'"+_name+"' is a floating point option");
+        return *(i->second.double_p);
       }
       ///\e
@@ -338 +341 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        if(i==_parser._opts.end()) throw LogicError();
-        else if(i->second.type!=ArgParser::INTEGER)
-          throw LogicError();
-        else return *(i->second.int_p);
+        LEMON_ASSERT(i==_parser._opts.end(),
+                     std::string()+"Unkown option: '"+_name+"'");
+        LEMON_ASSERT(i->second.type!=ArgParser::INTEGER,
+                     std::string()+"'"+_name+"' is an integer option");
+        return *(i->second.int_p);
       }