libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

Constness corrected

Browse Source
This commit is contained in:
Marc Wäckerlin
2004-11-25 18:26:04 +00:00
parent 35864b0f5e
commit 7fd9fbc634
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mrw/arg.cpp
View File

@@ -9,6 +9,9 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
$Log$ $Log$
Revision 1.2 2004/11/25 18:26:04 marc
Constness corrected
Revision 1.1 2004/08/28 16:13:42 marc Revision 1.1 2004/08/28 16:13:42 marc
mrw-c++-0.92 (mrw) mrw-c++-0.92 (mrw)
- new file: version.cpp - new file: version.cpp
@@ -72,7 +75,7 @@ namespace mrw {
return *this; return *this;
} }
Args& Args::operator<<(const char *const*const argv) throw(std::exception) { Args& Args::operator<<(char const*const*const argv) throw(std::exception) {
if (_argc<0) if (_argc<0)
throw mrw::invalid_argument("argc was not set when shifting argv"); throw mrw::invalid_argument("argc was not set when shifting argv");
return parse(_argc, argv); return parse(_argc, argv);
@@ -90,7 +93,7 @@ namespace mrw {
return *it->second; return *it->second;
} }
Args& Args::parse(int argc, const char*const*const argv) Args& Args::parse(int argc, char const*const*const argv)
throw(std::exception) { throw(std::exception) {
if (argc>0) _filename = argv[0]; if (argc>0) _filename = argv[0];
for (int i(1); i<argc; ++i) { for (int i(1); i<argc; ++i) {

25
mrw/arg.hpp
View File

@@ -9,6 +9,9 @@
@license LGPL, see file <a href="license.html">COPYING</a> @license LGPL, see file <a href="license.html">COPYING</a>
$Log$ $Log$
Revision 1.5 2004/11/25 18:26:04 marc
Constness corrected
Revision 1.4 2004/10/07 09:23:39 marc Revision 1.4 2004/10/07 09:23:39 marc
bugs in documentation bugs in documentation
@@ -84,7 +87,7 @@ namespace mrw {
@code @code
// this program may be called e.g. with the following arguments: // this program may be called e.g. with the following arguments:
// ./a.out --coordinates 13 1 -vo out.txt -n MyName // ./a.out --coordinates 13 1 -vo out.txt -n MyName
int main(int argv, const char * const * const argv) { int main(int argv, char const*const*const argv) {
try { try {
mrw::Args::instance() mrw::Args::instance()
// setup the possible options // setup the possible options
@@ -104,8 +107,12 @@ namespace mrw {
// example usage of simple option // example usage of simple option
if (mrw::Args::instance().find('v')) // be verbose here if (mrw::Args::instance().find('v')) // be verbose here
... ...
// example usage of option with (one) parameter // example usage of option with one parameter
ifstream file(mrw::Args::instance().find('o').toString().c_str()); ifstream file(mrw::Args::instance().find('o')[0]->toString().c_str());
...
// example usage of option with two parameter
int x = mrw::Args::instance().find('c')[0]->toInt().c_str());
int y = mrw::Args::instance().find('c')[1]->toInt().c_str());
... ...
return 0 return 0
} }
@@ -182,7 +189,7 @@ namespace mrw {
Do the same for all other parts Then the @c main() function reduces to: Do the same for all other parts Then the @c main() function reduces to:
@code @code
int main(int argc, const char * const * const argv) { int main(int argc, char const*const*const argv) {
// set the help and evaluate the user given arguments // set the help and evaluate the user given arguments
mrw::Args::instance() mrw::Args::instance()
<<mrw::Opt('h', "--help", "Show this help text") <<mrw::Opt('h', "--help", "Show this help text")
@@ -323,7 +330,7 @@ namespace mrw {
} }
/// @brief add one more mandatory string parameter /// @brief add one more mandatory string parameter
Param& operator<<(const char* const s) throw(std::bad_exception) { Param& operator<<(char const*const s) throw(std::bad_exception) {
_params.push_back(new StringValue(s)); _params.push_back(new StringValue(s));
return *this; return *this;
} }
@@ -508,7 +515,7 @@ namespace mrw {
Example: Example:
@code @code
int main(int argv, const char * const * const argv) { int main(int argv, char const*const*const argv) {
mrw::Args::instance()<<argc<<argv; mrw::Args::instance()<<argc<<argv;
... ...
} }
@@ -527,13 +534,13 @@ namespace mrw {
Example: Example:
@code @code
int main(int argv, const char * const * const argv) { int main(int argv, char const*const*const argv) {
mrw::Args::instance()<<argc<<argv; mrw::Args::instance()<<argc<<argv;
... ...
} }
@endcode @endcode
*/ */
Args& operator<<(const char *const*const argv) throw(std::exception); Args& operator<<(char const*const*const argv) throw(std::exception);
/** @brief add a description text /** @brief add a description text
@@ -625,7 +632,7 @@ namespace mrw {
private: private:
Args(): _argc(-1), _help(0) {} // singleton Args(): _argc(-1), _help(0) {} // singleton
Args& operator=(const Args&); // singleton, not implemented Args& operator=(const Args&); // singleton, not implemented
Args& parse(int argc, const char*const*const argv) throw(std::exception); Args& parse(int argc, char const*const*const argv) throw(std::exception);
typedef std::list<Opt> Options; typedef std::list<Opt> Options;
typedef std::map<char, Options::iterator> ShortOpts; typedef std::map<char, Options::iterator> ShortOpts;
typedef std::map<std::string, Options::iterator> LongOpts; typedef std::map<std::string, Options::iterator> LongOpts;