[Lemon-commits] deba: r3499 - lemon/trunk/lemon

[Lemon SVN]

Author: deba
Date: Fri Jun 13 11:51:45 2008
New Revision: 3499

Modified:
   lemon/trunk/lemon/arg_parser.h

Log:
Back porting hg commit 81563e019fa4



Modified: lemon/trunk/lemon/arg_parser.h
==============================================================================
--- lemon/trunk/lemon/arg_parser.h	(original)
+++ lemon/trunk/lemon/arg_parser.h	Fri Jun 13 11:51:45 2008
@@ -310,9 +310,9 @@
       operator bool() 
       {
 	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);
       }
@@ -320,9 +320,9 @@
       operator std::string()
       {
 	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);
       }
@@ -330,10 +330,10 @@
       operator double() 
       {
 	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 ?
 	  *(i->second.double_p) : *(i->second.int_p);
@@ -342,9 +342,9 @@
       operator int() 
       {
 	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);
       }