Changeset 2613:3d14a3449362 in lemon-0.x

Timestamp:

06/13/08 11:51:45 (15 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Back porting hg commit 81563e019fa4

File:

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

lemon/arg_parser.h

@@ -311 +311 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i==_parser._opts.end(),
+        LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type!=ArgParser::BOOL,
+        LEMON_ASSERT(i->second.type==ArgParser::BOOL,
                      std::string()+"'"+_name+"' is a bool option");
         return *(i->second.bool_p);
@@ -321 +321 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i==_parser._opts.end(),
+        LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type!=ArgParser::STRING,
+        LEMON_ASSERT(i->second.type==ArgParser::STRING,
                      std::string()+"'"+_name+"' is a string option");
         return *(i->second.string_p);
@@ -331 +331 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i==_parser._opts.end(),
+        LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type!=ArgParser::DOUBLE &&
-                     i->second.type!=ArgParser::INTEGER,
+        LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
+                     i->second.type==ArgParser::INTEGER,
                      std::string()+"'"+_name+"' is a floating point option");
         return i->second.type==ArgParser::DOUBLE ?
@@ -343 +343 @@
       {
         Opts::iterator i = _parser._opts.find(_name);
-        LEMON_ASSERT(i==_parser._opts.end(),
+        LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
-        LEMON_ASSERT(i->second.type!=ArgParser::INTEGER,
+        LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
                      std::string()+"'"+_name+"' is an integer option");
         return *(i->second.int_p);