Changeset 214:60eecd3fe37a in lemon for lemon/arg_parser.h

Timestamp:

07/13/08 23:05:25 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Some cleanup in ArgParser? API (ticket #116)

File:

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

lemon/arg_parser.h

@@ -272 +272 @@
     ///@}
 
-    void show(std::ostream &os,Opts::iterator i);
-    void show(std::ostream &os,Groups::iterator i);
-    void showHelp(Opts::iterator i);
-    void showHelp(std::vector<OtherArg>::iterator i);
-    void shortHelp();
-    void showHelp();
-
-    void unknownOpt(std::string arg);
-
-    void requiresValue(std::string arg, OptType t);
-    void checkMandatories();
+  private:
+    void show(std::ostream &os,Opts::const_iterator i) const;
+    void show(std::ostream &os,Groups::const_iterator i) const;
+    void showHelp(Opts::const_iterator i) const;
+    void showHelp(std::vector<OtherArg>::const_iterator i) const;
+
+    void unknownOpt(std::string arg) const;
+
+    void requiresValue(std::string arg, OptType t) const;
+    void checkMandatories() const;
+
+    void shortHelp() const;
+    void showHelp() const;
+  public:
 
     ///Start the parsing process
@@ -294 +297 @@
 
     ///Give back the command name (the 0th argument)
-    const std::string &commandName() { return _command_name; }
+    const std::string &commandName() const { return _command_name; }
 
     ///Check if an opion has been given to the command.
-    bool given(std::string op)
-    {
-      Opts::iterator i = _opts.find(op);
+    bool given(std::string op) const
+    {
+      Opts::const_iterator i = _opts.find(op);
       return i!=_opts.end()?i->second.set:false;
     }
@@ -312 +315 @@
     class RefType
     {
-      ArgParser &_parser;
+      const ArgParser &_parser;
       std::string _name;
     public:
       ///\e
-      RefType(ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
+      RefType(const ArgParser &p,const std::string &n) :_parser(p),_name(n) {}
       ///\e
       operator bool()
       {
-        Opts::iterator i = _parser._opts.find(_name);
+        Opts::const_iterator i = _parser._opts.find(_name);
         LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
@@ -330 +333 @@
       operator std::string()
       {
-        Opts::iterator i = _parser._opts.find(_name);
+        Opts::const_iterator i = _parser._opts.find(_name);
         LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
@@ -340 +343 @@
       operator double()
       {
-        Opts::iterator i = _parser._opts.find(_name);
+        Opts::const_iterator i = _parser._opts.find(_name);
         LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
@@ -352 +355 @@
       operator int()
       {
-        Opts::iterator i = _parser._opts.find(_name);
+        Opts::const_iterator i = _parser._opts.find(_name);
         LEMON_ASSERT(i!=_parser._opts.end(),
                      std::string()+"Unkown option: '"+_name+"'");
@@ -366 +369 @@
     ///Give back the value of an option.
     ///\sa RefType
-    RefType operator[](const std::string &n)
+    RefType operator[](const std::string &n) const
     {
       return RefType(*this, n);
@@ -375 +378 @@
     ///Give back a reference to a vector consisting of the program arguments
     ///not starting with a '-' character.
-    std::vector<std::string> &files() { return _file_args; }
+    const std::vector<std::string> &files() const { return _file_args; }
 
   };