LEMON/LEMON-main Changeset - r843:81f7e910060b

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r843:81f7e910060b

« 842:c2ff0a
« 841:aa8c90

845:a5fc1e »

r843:81f7e910060b

Sun, 28 Feb 2010 19:23:01

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge #332

0 3 0

merge default

0 files changed with 70 insertions and 5 deletions:

demo/arg_parser_demo.cc

lemon/arg_parser.cc

lemon/arg_parser.h

↑ Collapse diff ↑

demo/arg_parser_demo.cc

Show inline comments

@@ -62,15 +62,24 @@
 		  // Set the options of the group exclusive (only one option can be given)
 		  ap.onlyOneGroup("gr");
 		  // Add non-parsed arguments (e.g. input files)
 		  ap.other("infile", "The input file.")
 		    .other("...");
 		  // Throw an exception when problems occurs. The default behavior is to
 		  // exit(1) on these cases, but this makes Valgrind falsely warn
 		  // about memory leaks.
 		  ap.throwOnProblems();
 		  // Perform the parsing process
 		  // (in case of any error it terminates the program)
 		  // The try {} construct is necessary only if the ap.trowOnProblems()
 		  // setting is in use.
 		  try {
 		  ap.parse();
 		  } catch (ArgParserException &) { return 1; }
 		  // Check each option if it has been given and print its value
 		  std::cout << "Parameters of '" << ap.commandName() << "':\n";
 		  std::cout << "  Value of -n: " << i << std::endl;
 		  if(ap.given("val")) std::cout << "  Value of -val: " << d << std::endl;

lemon/arg_parser.cc

Show inline comments

@@ -17,20 +17,29 @@
 */

#include <lemon/arg_parser.h>

namespace lemon {

  void ArgParser::_terminate(ArgParserException::Reason reason) const
  {
    if(_exit_on_problems)
      exit(1);
    else throw(ArgParserException(reason));
  }
  
  
  void ArgParser::_showHelp(void *p)
  {
    (static_cast<ArgParser*>(p))->showHelp();
    exit(1);
    (static_cast<ArgParser*>(p))->_terminate(ArgParserException::HELP);
  }

  ArgParser::ArgParser(int argc, const char * const *argv)
    :_argc(argc), _argv(argv), _command_name(argv[0]) {
    :_argc(argc), _argv(argv), _command_name(argv[0]),
    _exit_on_problems(true) {
    funcOption("-help","Print a short help message",_showHelp,this);
    synonym("help","-help");
    synonym("h","-help");
  }

  ArgParser::~ArgParser()
@@ -339,22 +348,22 @@
  {
    shortHelp();
    std::cerr << "Where:\n";
    for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
        i!=_others_help.end();++i) showHelp(i);
    for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
    exit(1);
    _terminate(ArgParserException::HELP);
  }


  void ArgParser::unknownOpt(std::string arg) const
  {
    std::cerr << "\nUnknown option: " << arg << "\n";
    std::cerr << "\nType '" << _command_name <<
      " --help' to obtain a short summary on the usage.\n\n";
    exit(1);
    _terminate(ArgParserException::UNKNOWN_OPT);
  }

  void ArgParser::requiresValue(std::string arg, OptType t) const
  {
    std::cerr << "Argument '" << arg << "' requires a";
    switch(t) {
@@ -411,13 +420,13 @@
              showHelp(_opts.find(*o));
          }
        }
    if(!ok) {
      std::cerr << "\nType '" << _command_name <<
        " --help' to obtain a short summary on the usage.\n\n";
      exit(1);
      _terminate(ArgParserException::INVALID_OPT);
    }
  }

  ArgParser &ArgParser::parse()
  {
    for(int ar=1; ar<_argc; ++ar) {

lemon/arg_parser.h

Show inline comments

@@ -31,12 +31,50 @@
 		///\ingroup misc
 		///\file
 		///\brief A tool to parse command line arguments.
 		namespace lemon {
 		  ///Exception used by ArgParser
 		  class ArgParserException : public Exception {
 		  public:
 		    enum Reason {
 		      HELP,         /// <tt>--help</tt> option was given
 		      UNKNOWN_OPT,  /// Unknown option was given
 		      INVALID_OPT   /// Invalid combination of options
 		    };
 		  private:
 		    Reason _reason;
 		  public:
 		    ///Constructor
 		    ArgParserException(Reason r) throw() : _reason(r) {}
 		    ///Virtual destructor
 		    virtual ~ArgParserException() throw() {}
 		    ///A short description of the exception
 		    virtual const char* what() const throw() {
 		      switch(_reason)
+		        {
 		        case HELP:
 		          return "lemon::ArgParseException: ask for help";
 		          break;
 		        case UNKNOWN_OPT:
 		          return "lemon::ArgParseException: unknown option";
 		          break;
 		        case INVALID_OPT:
 		          return "lemon::ArgParseException: invalid combination of options";
 		          break;
+		        }
 		      return "";
+		    }
 		    ///Return the reason for the failure
 		    Reason reason() const {return _reason; }
 		  };
 		  ///Command line arguments parser
 		  ///\ingroup misc
 		  ///Command line arguments parser.
 		  ///
 		  ///For a complete example see the \ref arg_parser_demo.cc demo file.
@@ -113,12 +151,16 @@
 		    //  must be of type "void f(void *)"
 		    //\param data Data to be passed to \c func
 		    ArgParser &funcOption(const std::string &name,
 		                    const std::string &help,
 		                    void (*func)(void *),void *data);
 		    bool _exit_on_problems;
 		    void _terminate(ArgParserException::Reason reason) const;
 		  public:
 		    ///Constructor
 		    ArgParser(int argc, const char * const *argv);
 		    ~ArgParser();
@@ -377,10 +419,15 @@
 		    ///Give back the non-option type arguments.
 		    ///Give back a reference to a vector consisting of the program arguments
 		    ///not starting with a '-' character.
 		    const std::vector<std::string> &files() const { return _file_args; }
 		    ///Throw instead of exit in case of problems
 		    void throwOnProblems()
+		    {
 		      _exit_on_problems=false;
+		    }
 		  };
+		}
 		#endif // LEMON_ARG_PARSER_H

0 comments (0 inline)

...	...	@@ -17,20 +17,29 @@
17	17	*/
18	18
19	19	#include <lemon/arg_parser.h>
20	20
21	21	namespace lemon {
22	22
	23	void ArgParser::_terminate(ArgParserException::Reason reason) const
	24	{
	25	if(_exit_on_problems)
	26	exit(1);
	27	else throw(ArgParserException(reason));
	28	}
	29
	30
23	31	void ArgParser::_showHelp(void *p)
24	32	{
25	33	(static_cast<ArgParser*>(p))->showHelp();
26		~~exit~~(1);
	34	(static_cast<ArgParser*>(p))->_terminate(ArgParserException::HELP);
27	35	}
28	36
29	37	ArgParser::ArgParser(int argc, const char * const *argv)
30		:_argc(argc), _argv(argv), _command_name(argv[0]) {
	38	:_argc(argc), _argv(argv), _command_name(argv[0]),
	39	_exit_on_problems(true) {
31	40	funcOption("-help","Print a short help message",_showHelp,this);
32	41	synonym("help","-help");
33	42	synonym("h","-help");
34	43	}
35	44
36	45	ArgParser::~ArgParser()
...	...	@@ -339,22 +348,22 @@
339	348	{
340	349	shortHelp();
341	350	std::cerr << "Where:\n";
342	351	for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
343	352	i!=_others_help.end();++i) showHelp(i);
344	353	for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
345		~~exit~~(1);
	354	_terminate(ArgParserException::HELP);
346	355	}
347	356
348	357
349	358	void ArgParser::unknownOpt(std::string arg) const
350	359	{
351	360	std::cerr << "\nUnknown option: " << arg << "\n";
352	361	std::cerr << "\nType '" << _command_name <<
353	362	" --help' to obtain a short summary on the usage.\n\n";
354		~~exit~~(1);
	363	_terminate(ArgParserException::UNKNOWN_OPT);
355	364	}
356	365
357	366	void ArgParser::requiresValue(std::string arg, OptType t) const
358	367	{
359	368	std::cerr << "Argument '" << arg << "' requires a";
360	369	switch(t) {
...	...	@@ -411,13 +420,13 @@
411	420	showHelp(_opts.find(*o));
412	421	}
413	422	}
414	423	if(!ok) {
415	424	std::cerr << "\nType '" << _command_name <<
416	425	" --help' to obtain a short summary on the usage.\n\n";
417		~~exit~~(1);
	426	_terminate(ArgParserException::INVALID_OPT);
418	427	}
419	428	}
420	429
421	430	ArgParser &ArgParser::parse()
422	431	{
423	432	for(int ar=1; ar<_argc; ++ar) {

RhodeCode

Login to your account