LEMON/LEMON-main Changeset - r214:60eecd3fe37a

Repositories » LEMON » LEMON-main

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

Changeset - r214:60eecd3fe37a

« 210:81cfc0

215:17c644 »

r214:60eecd3fe37a

Sun, 13 Jul 2008 23:05:25

[Not Reviewed]

0 comments (0 inline)

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

Some cleanup in ArgParser API (ticket #116)

0 2 0

default

2 files changed with 45 insertions and 41 deletions:

lemon/arg_parser.cc

lemon/arg_parser.h

↑ Collapse diff ↑

lemon/arg_parser.cc

Show inline comments

@@ -238,13 +238,13 @@
    _others_help.push_back(OtherArg(name,help));
    return *this;
  }

  void ArgParser::show(std::ostream &os,Opts::iterator i)
  void ArgParser::show(std::ostream &os,Opts::const_iterator i) const
  {
    os << "-" << i->first;
    if(i->second.has_syn)
      for(Opts::iterator j=_opts.begin();j!=_opts.end();++j)
      for(Opts::const_iterator j=_opts.begin();j!=_opts.end();++j)
        if(j->second.syn&&j->second.help==i->first)
          os << "|-" << j->first;
    switch(i->second.type) {
    case STRING:
@@ -260,40 +260,41 @@
      break;
    }
  }

  void ArgParser::show(std::ostream &os,Groups::iterator i)
  void ArgParser::show(std::ostream &os,Groups::const_iterator i) const
  {
    GroupData::Opts::iterator o=i->second.opts.begin();
    GroupData::Opts::const_iterator o=i->second.opts.begin();
    while(o!=i->second.opts.end()) {
      show(os,_opts.find(*o));
      ++o;
      if(o!=i->second.opts.end()) os<<'|';
    }
  }

  void ArgParser::showHelp(Opts::iterator i)
  void ArgParser::showHelp(Opts::const_iterator i) const
  {
    if(i->second.help.size()==0||i->second.syn) return;
    std::cerr << "  ";
    show(std::cerr,i);
    std::cerr << std::endl;
    std::cerr << "     " << i->second.help << std::endl;
  }
  void ArgParser::showHelp(std::vector<ArgParser::OtherArg>::iterator i)
  void ArgParser::showHelp(std::vector<ArgParser::OtherArg>::const_iterator i)
    const
  {
    if(i->help.size()==0) return;
    std::cerr << "  " << i->name << std::endl
              << "     " << i->help << std::endl;
  }

  void ArgParser::shortHelp()
  void ArgParser::shortHelp() const
  {
    const unsigned int LINE_LEN=77;
    const std::string indent("    ");
    std::cerr << "Usage:\n  " << _command_name;
    int pos=_command_name.size()+2;
    for(Groups::iterator g=_groups.begin();g!=_groups.end();++g) {
    for(Groups::const_iterator g=_groups.begin();g!=_groups.end();++g) {
      std::ostringstream cstr;
      cstr << ' ';
      if(!g->second.mandatory) cstr << '[';
      show(cstr,g);
@@ -304,9 +305,9 @@
      }
      std::cerr << cstr.str();
      pos+=cstr.str().size();
    }
    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
    for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
      if(!i->second.ingroup&&!i->second.syn) {
        std::ostringstream cstr;
        cstr << ' ';
        if(!i->second.mandatory) cstr << '[';
@@ -318,9 +319,9 @@
        }
        std::cerr << cstr.str();
        pos+=cstr.str().size();
      }
    for(std::vector<OtherArg>::iterator i=_others_help.begin();
    for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
        i!=_others_help.end();++i)
      {
        std::ostringstream cstr;
        cstr << ' ' << i->name;
@@ -334,28 +335,28 @@
      }
    std::cerr << std::endl;
  }

  void ArgParser::showHelp()
  void ArgParser::showHelp() const
  {
    shortHelp();
    std::cerr << "Where:\n";
    for(std::vector<OtherArg>::iterator i=_others_help.begin();
    for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
        i!=_others_help.end();++i) showHelp(i);
    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
    for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
    exit(1);
  }


  void ArgParser::unknownOpt(std::string arg)
  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);
  }

  void ArgParser::requiresValue(std::string arg, OptType t)
  void ArgParser::requiresValue(std::string arg, OptType t) const
  {
    std::cerr << "Argument '" << arg << "' requires a";
    switch(t) {
    case STRING:
@@ -374,40 +375,40 @@
    showHelp();
  }


  void ArgParser::checkMandatories()
  void ArgParser::checkMandatories() const
  {
    bool ok=true;
    for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
    for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
      if(i->second.mandatory&&!i->second.set)
        {
          if(ok)
            std::cerr << _command_name
                      << ": The following mandatory arguments are missing.\n";
          ok=false;
          showHelp(i);
        }
    for(Groups::iterator i=_groups.begin();i!=_groups.end();++i)
    for(Groups::const_iterator i=_groups.begin();i!=_groups.end();++i)
      if(i->second.mandatory||i->second.only_one)
        {
          int set=0;
          for(GroupData::Opts::iterator o=i->second.opts.begin();
          for(GroupData::Opts::const_iterator o=i->second.opts.begin();
              o!=i->second.opts.end();++o)
            if(_opts.find(*o)->second.set) ++set;
          if(i->second.mandatory&&!set) {
            std::cerr << _command_name <<
              ": At least one of the following arguments is mandatory.\n";
            ok=false;
            for(GroupData::Opts::iterator o=i->second.opts.begin();
            for(GroupData::Opts::const_iterator o=i->second.opts.begin();
                o!=i->second.opts.end();++o)
              showHelp(_opts.find(*o));
          }
          if(i->second.only_one&&set>1) {
            std::cerr << _command_name <<
              ": At most one of the following arguments can be given.\n";
            ok=false;
            for(GroupData::Opts::iterator o=i->second.opts.begin();
            for(GroupData::Opts::const_iterator o=i->second.opts.begin();
                o!=i->second.opts.end();++o)
              showHelp(_opts.find(*o));
          }
        }

lemon/arg_parser.h

Show inline comments

@@ -270,19 +270,22 @@
 		                           const std::string &opt);
 		    ///@}
 		    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();
 		  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);
+		    void unknownOpt(std::string arg) const;
 		    void requiresValue(std::string arg, OptType t);
 		    void checkMandatories();
 		    void requiresValue(std::string arg, OptType t) const;
 		    void checkMandatories() const;
 		    void shortHelp() const;
 		    void showHelp() const;
 		  public:
 		    ///Start the parsing process
 		    ArgParser &parse();
@@ -292,14 +295,14 @@
 		      return parse();
+		    }
 		    ///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)
+		    bool given(std::string op) const
+		    {
-		      Opts::iterator i = _opts.find(op);
+		      Opts::const_iterator i = _opts.find(op);
 		      return i!=_opts.end()?i->second.set:false;
+		    }
@@ -310,17 +313,17 @@
 		    ///\c std::string if the type of the option matches, otherwise it
 		    ///throws an exception (i.e. it performs runtime type checking).
 		    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+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::BOOL,
 		                     std::string()+"'"+_name+"' is a bool option");
@@ -328,9 +331,9 @@
+		      }
 		      ///\e
 		      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+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::STRING,
 		                     std::string()+"'"+_name+"' is a string option");
@@ -338,9 +341,9 @@
+		      }
 		      ///\e
 		      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+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::DOUBLE ||
 		                     i->second.type==ArgParser::INTEGER,
@@ -350,9 +353,9 @@
+		      }
 		      ///\e
 		      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+"'");
 		        LEMON_ASSERT(i->second.type==ArgParser::INTEGER,
 		                     std::string()+"'"+_name+"' is an integer option");
@@ -364,18 +367,18 @@
 		    ///Give back the value of an option
 		    ///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);
+		    }
 		    ///Give back the non-option type arguments.
 		    ///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; }
 		  };
+		}

0 comments (0 inline)

...	...	@@ -238,13 +238,13 @@
238	238	_others_help.push_back(OtherArg(name,help));
239	239	return *this;
240	240	}
241	241
242		void ArgParser::show(std::ostream &os,Opts::~~iterator~~ i)
	242	void ArgParser::show(std::ostream &os,Opts::const_iterator i) const
243	243	{
244	244	os << "-" << i->first;
245	245	if(i->second.has_syn)
246		for(Opts::~~iterator~~ j=_opts.begin();j!=_opts.end();++j)
	246	for(Opts::const_iterator j=_opts.begin();j!=_opts.end();++j)
247	247	if(j->second.syn&&j->second.help==i->first)
248	248	os << "\|-" << j->first;
249	249	switch(i->second.type) {
250	250	case STRING:
...	...	@@ -260,40 +260,41 @@
260	260	break;
261	261	}
262	262	}
263	263
264		void ArgParser::show(std::ostream &os,Groups::~~iterator~~ i)
	264	void ArgParser::show(std::ostream &os,Groups::const_iterator i) const
265	265	{
266		GroupData::Opts::~~iterator~~ o=i->second.opts.begin();
	266	GroupData::Opts::const_iterator o=i->second.opts.begin();
267	267	while(o!=i->second.opts.end()) {
268	268	show(os,_opts.find(*o));
269	269	++o;
270	270	if(o!=i->second.opts.end()) os<<'\|';
271	271	}
272	272	}
273	273
274		void ArgParser::showHelp(Opts::~~iterator~~ i)
	274	void ArgParser::showHelp(Opts::const_iterator i) const
275	275	{
276	276	if(i->second.help.size()==0\|\|i->second.syn) return;
277	277	std::cerr << " ";
278	278	show(std::cerr,i);
279	279	std::cerr << std::endl;
280	280	std::cerr << " " << i->second.help << std::endl;
281	281	}
282		void ArgParser::showHelp(std::vector<ArgParser::OtherArg>::~~iterator~~ i)
	282	void ArgParser::showHelp(std::vector<ArgParser::OtherArg>::const_iterator i)
	283	const
283	284	{
284	285	if(i->help.size()==0) return;
285	286	std::cerr << " " << i->name << std::endl
286	287	<< " " << i->help << std::endl;
287	288	}
288	289
289		void ArgParser::shortHelp()
	290	void ArgParser::shortHelp() const
290	291	{
291	292	const unsigned int LINE_LEN=77;
292	293	const std::string indent(" ");
293	294	std::cerr << "Usage:\n " << _command_name;
294	295	int pos=_command_name.size()+2;
295		for(Groups::~~iterator~~ g=_groups.begin();g!=_groups.end();++g) {
	296	for(Groups::const_iterator g=_groups.begin();g!=_groups.end();++g) {
296	297	std::ostringstream cstr;
297	298	cstr << ' ';
298	299	if(!g->second.mandatory) cstr << '[';
299	300	show(cstr,g);
...	...	@@ -304,9 +305,9 @@
304	305	}
305	306	std::cerr << cstr.str();
306	307	pos+=cstr.str().size();
307	308	}
308		for(Opts::~~iterator~~ i=_opts.begin();i!=_opts.end();++i)
	309	for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
309	310	if(!i->second.ingroup&&!i->second.syn) {
310	311	std::ostringstream cstr;
311	312	cstr << ' ';
312	313	if(!i->second.mandatory) cstr << '[';
...	...	@@ -318,9 +319,9 @@
318	319	}
319	320	std::cerr << cstr.str();
320	321	pos+=cstr.str().size();
321	322	}
322		for(std::vector<OtherArg>::~~iterator~~ i=_others_help.begin();
	323	for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
323	324	i!=_others_help.end();++i)
324	325	{
325	326	std::ostringstream cstr;
326	327	cstr << ' ' << i->name;
...	...	@@ -334,28 +335,28 @@
334	335	}
335	336	std::cerr << std::endl;
336	337	}
337	338
338		void ArgParser::showHelp()
	339	void ArgParser::showHelp() const
339	340	{
340	341	shortHelp();
341	342	std::cerr << "Where:\n";
342		for(std::vector<OtherArg>::~~iterator~~ i=_others_help.begin();
	343	for(std::vector<OtherArg>::const_iterator i=_others_help.begin();
343	344	i!=_others_help.end();++i) showHelp(i);
344		for(Opts::~~iterator~~ i=_opts.begin();i!=_opts.end();++i) showHelp(i);
	345	for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
345	346	exit(1);
346	347	}
347	348
348	349
349		void ArgParser::unknownOpt(std::string arg)
	350	void ArgParser::unknownOpt(std::string arg) const
350	351	{
351	352	std::cerr << "\nUnknown option: " << arg << "\n";
352	353	std::cerr << "\nType '" << _command_name <<
353	354	" --help' to obtain a short summary on the usage.\n\n";
354	355	exit(1);
355	356	}
356	357
357		void ArgParser::requiresValue(std::string arg, OptType t)
	358	void ArgParser::requiresValue(std::string arg, OptType t) const
358	359	{
359	360	std::cerr << "Argument '" << arg << "' requires a";
360	361	switch(t) {
361	362	case STRING:
...	...	@@ -374,40 +375,40 @@
374	375	showHelp();
375	376	}
376	377
377	378
378		void ArgParser::checkMandatories()
	379	void ArgParser::checkMandatories() const
379	380	{
380	381	bool ok=true;
381		for(Opts::~~iterator~~ i=_opts.begin();i!=_opts.end();++i)
	382	for(Opts::const_iterator i=_opts.begin();i!=_opts.end();++i)
382	383	if(i->second.mandatory&&!i->second.set)
383	384	{
384	385	if(ok)
385	386	std::cerr << _command_name
386	387	<< ": The following mandatory arguments are missing.\n";
387	388	ok=false;
388	389	showHelp(i);
389	390	}
390		for(Groups::~~iterator~~ i=_groups.begin();i!=_groups.end();++i)
	391	for(Groups::const_iterator i=_groups.begin();i!=_groups.end();++i)
391	392	if(i->second.mandatory\|\|i->second.only_one)
392	393	{
393	394	int set=0;
394		for(GroupData::Opts::~~iterator~~ o=i->second.opts.begin();
	395	for(GroupData::Opts::const_iterator o=i->second.opts.begin();
395	396	o!=i->second.opts.end();++o)
396	397	if(_opts.find(*o)->second.set) ++set;
397	398	if(i->second.mandatory&&!set) {
398	399	std::cerr << _command_name <<
399	400	": At least one of the following arguments is mandatory.\n";
400	401	ok=false;
401		for(GroupData::Opts::~~iterator~~ o=i->second.opts.begin();
	402	for(GroupData::Opts::const_iterator o=i->second.opts.begin();
402	403	o!=i->second.opts.end();++o)
403	404	showHelp(_opts.find(*o));
404	405	}
405	406	if(i->second.only_one&&set>1) {
406	407	std::cerr << _command_name <<
407	408	": At most one of the following arguments can be given.\n";
408	409	ok=false;
409		for(GroupData::Opts::~~iterator~~ o=i->second.opts.begin();
	410	for(GroupData::Opts::const_iterator o=i->second.opts.begin();
410	411	o!=i->second.opts.end();++o)
411	412	showHelp(_opts.find(*o));
412	413	}
413	414	}

RhodeCode

Login to your account