Changeset 95:cc7e6b8b59bf in lemon-main

Timestamp:

03/18/08 16:45:21 (17 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Bug fix in arg_parser.h (fix ticket #31) and doc improvements

File:

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

lemon/arg_parser.h

@@ -128 +128 @@
     ///\param name The name of the option. The leading '-' must be omitted.
     ///\param help A help string.
-    ///\param value A default value for the option
+    ///\param value A default value for the option.
     ///\param obl Indicate if the option is mandatory.
     ArgParser &intOption(const std::string &name,
@@ -138 +138 @@
     ///\param name The name of the option. The leading '-' must be omitted.
     ///\param help A help string.
-    ///\param value A default value for the option
+    ///\param value A default value for the option.
     ///\param obl Indicate if the option is mandatory.
     ArgParser &doubleOption(const std::string &name,
@@ -148 +148 @@
     ///\param name The name of the option. The leading '-' must be omitted.
     ///\param help A help string.
-    ///\param value A default value for the option
-    ///\param obl Indicate if the option is mandatory.
-    ////\note A mandatory bool obtion is of very little use.)
+    ///\param value A default value for the option.
+    ///\param obl Indicate if the option is mandatory.
+    ///\note A mandatory bool obtion is of very little use.
     ArgParser &boolOption(const std::string &name,
                       const std::string &help,
@@ -159 +159 @@
     ///\param name The name of the option. The leading '-' must be omitted.
     ///\param help A help string.
-    ///\param value A default value for the option
+    ///\param value A default value for the option.
     ///\param obl Indicate if the option is mandatory.
     ArgParser &stringOption(const std::string &name,
@@ -197 +197 @@
     ///\param obl Indicate if the option is mandatory.
     ///\retval ref The value of the argument will be written to this variable.
-    ////\note A mandatory bool obtion is of very little use.)
+    ///\note A mandatory bool obtion is of very little use.
     ArgParser &refOption(const std::string &name,
                       const std::string &help,
@@ -206 +206 @@
     ///\param name The name of the option. The leading '-' must be omitted.
     ///\param help A help string.
+    ///\param obl Indicate if the option is mandatory.
     ///\retval ref The value of the argument will be written to this variable.
-    ///\param obl Indicate if the option is mandatory.
     ArgParser &refOption(const std::string &name,
                       const std::string &help,
@@ -312 +312 @@
       {
         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);
@@ -322 +322 @@
       {
         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);
@@ -332 +332 @@
       {
         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 ?
@@ -344 +344 @@
       {
         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);