1.1 --- a/lemon/arg_parser.cc Sun Jul 13 16:46:56 2008 +0100
1.2 +++ b/lemon/arg_parser.cc Sun Jul 13 19:51:02 2008 +0100
1.3 @@ -1,6 +1,6 @@
1.4 -/* -*- C++ -*-
1.5 +/* -*- mode: C++; indent-tabs-mode: nil; -*-
1.6 *
1.7 - * This file is a part of LEMON, a generic C++ optimization library
1.8 + * This file is a part of LEMON, a generic C++ optimization library.
1.9 *
1.10 * Copyright (C) 2003-2008
1.11 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.12 @@ -38,30 +38,30 @@
1.13 {
1.14 for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
1.15 if(i->second.self_delete)
1.16 - switch(i->second.type) {
1.17 - case BOOL:
1.18 - delete i->second.bool_p;
1.19 - break;
1.20 - case STRING:
1.21 - delete i->second.string_p;
1.22 - break;
1.23 - case DOUBLE:
1.24 - delete i->second.double_p;
1.25 - break;
1.26 - case INTEGER:
1.27 - delete i->second.int_p;
1.28 - break;
1.29 - case UNKNOWN:
1.30 - break;
1.31 - case FUNC:
1.32 - break;
1.33 - }
1.34 + switch(i->second.type) {
1.35 + case BOOL:
1.36 + delete i->second.bool_p;
1.37 + break;
1.38 + case STRING:
1.39 + delete i->second.string_p;
1.40 + break;
1.41 + case DOUBLE:
1.42 + delete i->second.double_p;
1.43 + break;
1.44 + case INTEGER:
1.45 + delete i->second.int_p;
1.46 + break;
1.47 + case UNKNOWN:
1.48 + break;
1.49 + case FUNC:
1.50 + break;
1.51 + }
1.52 }
1.53 -
1.54 +
1.55
1.56 ArgParser &ArgParser::intOption(const std::string &name,
1.57 - const std::string &help,
1.58 - int value, bool obl)
1.59 + const std::string &help,
1.60 + int value, bool obl)
1.61 {
1.62 ParData p;
1.63 p.int_p=new int(value);
1.64 @@ -74,8 +74,8 @@
1.65 }
1.66
1.67 ArgParser &ArgParser::doubleOption(const std::string &name,
1.68 - const std::string &help,
1.69 - double value, bool obl)
1.70 + const std::string &help,
1.71 + double value, bool obl)
1.72 {
1.73 ParData p;
1.74 p.double_p=new double(value);
1.75 @@ -88,8 +88,8 @@
1.76 }
1.77
1.78 ArgParser &ArgParser::boolOption(const std::string &name,
1.79 - const std::string &help,
1.80 - bool value, bool obl)
1.81 + const std::string &help,
1.82 + bool value, bool obl)
1.83 {
1.84 ParData p;
1.85 p.bool_p=new bool(value);
1.86 @@ -102,8 +102,8 @@
1.87 }
1.88
1.89 ArgParser &ArgParser::stringOption(const std::string &name,
1.90 - const std::string &help,
1.91 - std::string value, bool obl)
1.92 + const std::string &help,
1.93 + std::string value, bool obl)
1.94 {
1.95 ParData p;
1.96 p.string_p=new std::string(value);
1.97 @@ -116,8 +116,8 @@
1.98 }
1.99
1.100 ArgParser &ArgParser::refOption(const std::string &name,
1.101 - const std::string &help,
1.102 - int &ref, bool obl)
1.103 + const std::string &help,
1.104 + int &ref, bool obl)
1.105 {
1.106 ParData p;
1.107 p.int_p=&ref;
1.108 @@ -161,8 +161,8 @@
1.109 }
1.110
1.111 ArgParser &ArgParser::refOption(const std::string &name,
1.112 - const std::string &help,
1.113 - std::string &ref, bool obl)
1.114 + const std::string &help,
1.115 + std::string &ref, bool obl)
1.116 {
1.117 ParData p;
1.118 p.string_p=&ref;
1.119 @@ -175,8 +175,8 @@
1.120 }
1.121
1.122 ArgParser &ArgParser::funcOption(const std::string &name,
1.123 - const std::string &help,
1.124 - void (*func)(void *),void *data)
1.125 + const std::string &help,
1.126 + void (*func)(void *),void *data)
1.127 {
1.128 ParData p;
1.129 p.func_p.p=func;
1.130 @@ -190,11 +190,11 @@
1.131 }
1.132
1.133 ArgParser &ArgParser::optionGroup(const std::string &group,
1.134 - const std::string &opt)
1.135 + const std::string &opt)
1.136 {
1.137 Opts::iterator i = _opts.find(opt);
1.138 LEMON_ASSERT(i!=_opts.end(), "Unknown option: '"+opt+"'");
1.139 - LEMON_ASSERT(!(i->second.ingroup),
1.140 + LEMON_ASSERT(!(i->second.ingroup),
1.141 "Option already in option group: '"+opt+"'");
1.142 GroupData &g=_groups[group];
1.143 g.opts.push_back(opt);
1.144 @@ -210,7 +210,7 @@
1.145 }
1.146
1.147 ArgParser &ArgParser::synonym(const std::string &syn,
1.148 - const std::string &opt)
1.149 + const std::string &opt)
1.150 {
1.151 Opts::iterator o = _opts.find(opt);
1.152 Opts::iterator s = _opts.find(syn);
1.153 @@ -233,7 +233,7 @@
1.154 }
1.155
1.156 ArgParser &ArgParser::other(const std::string &name,
1.157 - const std::string &help)
1.158 + const std::string &help)
1.159 {
1.160 _others_help.push_back(OtherArg(name,help));
1.161 return *this;
1.162 @@ -244,8 +244,8 @@
1.163 os << "-" << i->first;
1.164 if(i->second.has_syn)
1.165 for(Opts::iterator j=_opts.begin();j!=_opts.end();++j)
1.166 - if(j->second.syn&&j->second.help==i->first)
1.167 - os << "|-" << j->first;
1.168 + if(j->second.syn&&j->second.help==i->first)
1.169 + os << "|-" << j->first;
1.170 switch(i->second.type) {
1.171 case STRING:
1.172 os << " str";
1.173 @@ -270,7 +270,7 @@
1.174 if(o!=i->second.opts.end()) os<<'|';
1.175 }
1.176 }
1.177 -
1.178 +
1.179 void ArgParser::showHelp(Opts::iterator i)
1.180 {
1.181 if(i->second.help.size()==0||i->second.syn) return;
1.182 @@ -283,9 +283,9 @@
1.183 {
1.184 if(i->help.size()==0) return;
1.185 std::cerr << " " << i->name << std::endl
1.186 - << " " << i->help << std::endl;
1.187 + << " " << i->help << std::endl;
1.188 }
1.189 -
1.190 +
1.191 void ArgParser::shortHelp()
1.192 {
1.193 const unsigned int LINE_LEN=77;
1.194 @@ -299,62 +299,62 @@
1.195 show(cstr,g);
1.196 if(!g->second.mandatory) cstr << ']';
1.197 if(pos+cstr.str().size()>LINE_LEN) {
1.198 - std::cerr << std::endl << indent;
1.199 - pos=indent.size();
1.200 + std::cerr << std::endl << indent;
1.201 + pos=indent.size();
1.202 }
1.203 std::cerr << cstr.str();
1.204 pos+=cstr.str().size();
1.205 }
1.206 for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
1.207 if(!i->second.ingroup&&!i->second.syn) {
1.208 - std::ostringstream cstr;
1.209 - cstr << ' ';
1.210 - if(!i->second.mandatory) cstr << '[';
1.211 - show(cstr,i);
1.212 - if(!i->second.mandatory) cstr << ']';
1.213 - if(pos+cstr.str().size()>LINE_LEN) {
1.214 - std::cerr << std::endl << indent;
1.215 - pos=indent.size();
1.216 - }
1.217 - std::cerr << cstr.str();
1.218 - pos+=cstr.str().size();
1.219 + std::ostringstream cstr;
1.220 + cstr << ' ';
1.221 + if(!i->second.mandatory) cstr << '[';
1.222 + show(cstr,i);
1.223 + if(!i->second.mandatory) cstr << ']';
1.224 + if(pos+cstr.str().size()>LINE_LEN) {
1.225 + std::cerr << std::endl << indent;
1.226 + pos=indent.size();
1.227 + }
1.228 + std::cerr << cstr.str();
1.229 + pos+=cstr.str().size();
1.230 }
1.231 for(std::vector<OtherArg>::iterator i=_others_help.begin();
1.232 - i!=_others_help.end();++i)
1.233 + i!=_others_help.end();++i)
1.234 {
1.235 - std::ostringstream cstr;
1.236 - cstr << ' ' << i->name;
1.237 -
1.238 - if(pos+cstr.str().size()>LINE_LEN) {
1.239 - std::cerr << std::endl << indent;
1.240 - pos=indent.size();
1.241 - }
1.242 - std::cerr << cstr.str();
1.243 - pos+=cstr.str().size();
1.244 + std::ostringstream cstr;
1.245 + cstr << ' ' << i->name;
1.246 +
1.247 + if(pos+cstr.str().size()>LINE_LEN) {
1.248 + std::cerr << std::endl << indent;
1.249 + pos=indent.size();
1.250 + }
1.251 + std::cerr << cstr.str();
1.252 + pos+=cstr.str().size();
1.253 }
1.254 std::cerr << std::endl;
1.255 }
1.256 -
1.257 +
1.258 void ArgParser::showHelp()
1.259 {
1.260 shortHelp();
1.261 std::cerr << "Where:\n";
1.262 for(std::vector<OtherArg>::iterator i=_others_help.begin();
1.263 - i!=_others_help.end();++i) showHelp(i);
1.264 + i!=_others_help.end();++i) showHelp(i);
1.265 for(Opts::iterator i=_opts.begin();i!=_opts.end();++i) showHelp(i);
1.266 exit(1);
1.267 }
1.268 -
1.269 -
1.270 - void ArgParser::unknownOpt(std::string arg)
1.271 +
1.272 +
1.273 + void ArgParser::unknownOpt(std::string arg)
1.274 {
1.275 std::cerr << "\nUnknown option: " << arg << "\n";
1.276 std::cerr << "\nType '" << _command_name <<
1.277 " --help' to obtain a short summary on the usage.\n\n";
1.278 exit(1);
1.279 }
1.280 -
1.281 - void ArgParser::requiresValue(std::string arg, OptType t)
1.282 +
1.283 + void ArgParser::requiresValue(std::string arg, OptType t)
1.284 {
1.285 std::cerr << "Argument '" << arg << "' requires a";
1.286 switch(t) {
1.287 @@ -373,47 +373,47 @@
1.288 std::cerr << " value\n\n";
1.289 showHelp();
1.290 }
1.291 -
1.292 +
1.293
1.294 void ArgParser::checkMandatories()
1.295 {
1.296 bool ok=true;
1.297 for(Opts::iterator i=_opts.begin();i!=_opts.end();++i)
1.298 - if(i->second.mandatory&&!i->second.set)
1.299 - {
1.300 - if(ok)
1.301 - std::cerr << _command_name
1.302 - << ": The following mandatory arguments are missing.\n";
1.303 - ok=false;
1.304 - showHelp(i);
1.305 - }
1.306 + if(i->second.mandatory&&!i->second.set)
1.307 + {
1.308 + if(ok)
1.309 + std::cerr << _command_name
1.310 + << ": The following mandatory arguments are missing.\n";
1.311 + ok=false;
1.312 + showHelp(i);
1.313 + }
1.314 for(Groups::iterator i=_groups.begin();i!=_groups.end();++i)
1.315 if(i->second.mandatory||i->second.only_one)
1.316 - {
1.317 - int set=0;
1.318 - for(GroupData::Opts::iterator o=i->second.opts.begin();
1.319 - o!=i->second.opts.end();++o)
1.320 - if(_opts.find(*o)->second.set) ++set;
1.321 - if(i->second.mandatory&&!set) {
1.322 - std::cerr << _command_name
1.323 - << ": At least one of the following arguments is mandatory.\n";
1.324 - ok=false;
1.325 - for(GroupData::Opts::iterator o=i->second.opts.begin();
1.326 - o!=i->second.opts.end();++o)
1.327 - showHelp(_opts.find(*o));
1.328 - }
1.329 - if(i->second.only_one&&set>1) {
1.330 - std::cerr << _command_name
1.331 - << ": At most one of the following arguments can be given.\n";
1.332 - ok=false;
1.333 - for(GroupData::Opts::iterator o=i->second.opts.begin();
1.334 - o!=i->second.opts.end();++o)
1.335 - showHelp(_opts.find(*o));
1.336 - }
1.337 - }
1.338 + {
1.339 + int set=0;
1.340 + for(GroupData::Opts::iterator o=i->second.opts.begin();
1.341 + o!=i->second.opts.end();++o)
1.342 + if(_opts.find(*o)->second.set) ++set;
1.343 + if(i->second.mandatory&&!set) {
1.344 + std::cerr << _command_name
1.345 + << ": At least one of the following arguments is mandatory.\n";
1.346 + ok=false;
1.347 + for(GroupData::Opts::iterator o=i->second.opts.begin();
1.348 + o!=i->second.opts.end();++o)
1.349 + showHelp(_opts.find(*o));
1.350 + }
1.351 + if(i->second.only_one&&set>1) {
1.352 + std::cerr << _command_name
1.353 + << ": At most one of the following arguments can be given.\n";
1.354 + ok=false;
1.355 + for(GroupData::Opts::iterator o=i->second.opts.begin();
1.356 + o!=i->second.opts.end();++o)
1.357 + showHelp(_opts.find(*o));
1.358 + }
1.359 + }
1.360 if(!ok) {
1.361 std::cerr << "\nType '" << _command_name <<
1.362 - " --help' to obtain a short summary on the usage.\n\n";
1.363 + " --help' to obtain a short summary on the usage.\n\n";
1.364 exit(1);
1.365 }
1.366 }
1.367 @@ -423,43 +423,43 @@
1.368 for(int ar=1; ar<_argc; ++ar) {
1.369 std::string arg(_argv[ar]);
1.370 if (arg[0] != '-' || arg.size() == 1) {
1.371 - _file_args.push_back(arg);
1.372 + _file_args.push_back(arg);
1.373 }
1.374 else {
1.375 - Opts::iterator i = _opts.find(arg.substr(1));
1.376 - if(i==_opts.end()) unknownOpt(arg);
1.377 - else {
1.378 - if(i->second.syn) i=_opts.find(i->second.help);
1.379 - ParData &p(i->second);
1.380 - if (p.type==BOOL) *p.bool_p=true;
1.381 - else if (p.type==FUNC) p.func_p.p(p.func_p.data);
1.382 - else if(++ar==_argc) requiresValue(arg, p.type);
1.383 - else {
1.384 - std::string val(_argv[ar]);
1.385 - std::istringstream vals(val);
1.386 - switch(p.type) {
1.387 - case STRING:
1.388 - *p.string_p=val;
1.389 - break;
1.390 - case INTEGER:
1.391 - vals >> *p.int_p;
1.392 - break;
1.393 - case DOUBLE:
1.394 - vals >> *p.double_p;
1.395 - break;
1.396 - default:
1.397 - break;
1.398 - }
1.399 - if(p.type!=STRING&&(!vals||!vals.eof()))
1.400 - requiresValue(arg, p.type);
1.401 - }
1.402 - p.set = true;
1.403 - }
1.404 + Opts::iterator i = _opts.find(arg.substr(1));
1.405 + if(i==_opts.end()) unknownOpt(arg);
1.406 + else {
1.407 + if(i->second.syn) i=_opts.find(i->second.help);
1.408 + ParData &p(i->second);
1.409 + if (p.type==BOOL) *p.bool_p=true;
1.410 + else if (p.type==FUNC) p.func_p.p(p.func_p.data);
1.411 + else if(++ar==_argc) requiresValue(arg, p.type);
1.412 + else {
1.413 + std::string val(_argv[ar]);
1.414 + std::istringstream vals(val);
1.415 + switch(p.type) {
1.416 + case STRING:
1.417 + *p.string_p=val;
1.418 + break;
1.419 + case INTEGER:
1.420 + vals >> *p.int_p;
1.421 + break;
1.422 + case DOUBLE:
1.423 + vals >> *p.double_p;
1.424 + break;
1.425 + default:
1.426 + break;
1.427 + }
1.428 + if(p.type!=STRING&&(!vals||!vals.eof()))
1.429 + requiresValue(arg, p.type);
1.430 + }
1.431 + p.set = true;
1.432 + }
1.433 }
1.434 }
1.435 checkMandatories();
1.436
1.437 return *this;
1.438 - }
1.439 + }
1.440
1.441 }