user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stdlib: Report an error when getopts is given an argument to a flag option

Browse source
This commit is contained in:
Brian Anderson 2011-05-21 21:48:43 -04:00
parent 079711d5f6
commit a0f855e488
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/getopts.rs
View file

@ -98,6 +98,7 @@ tag fail_ {
unrecognized_option(str);
option_missing(str);
option_duplicated(str);
unexpected_argument(str);
}
fn fail_str(fail_ f) -> str {
@ -114,6 +115,9 @@ fn fail_str(fail_ f) -> str {
case (option_duplicated(?nm)) {
ret "option '" + nm + "' given more than once.";
}
case (unexpected_argument(?nm)) {
ret "Option " + nm + " does not take an argument.";
}
}
}
@ -173,6 +177,9 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
}
alt (opts.(optid).hasarg) {
case (no) {
if (!option::is_none[str](i_arg)) {
ret failure(unexpected_argument(name_str(nm)));
}
vec::push[optval](vals.(optid), given);
}
case (maybe) {