OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #16512 : wickerwaka/rust/getopt-16348, r=brson

Browse Source 
I don't know if anything else was relying on the old behavior, this seems more correct.

Fixes #16348

If '-F' is allowed to have an optional argument, with the previous version '-FF' would be translated to '-F -F'. In this new version '-FF' translates to '-F' with argument 'F'
This commit is contained in:
bors 2014-08-22 00:56:00 +00:00
commit 711d710278
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libgetopts/lib.rs
View File

@ -571,7 +571,6 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
} }
} else { } else {
let mut j = 1; let mut j = 1;
let mut last_valid_opt_id = None;
names = Vec::new(); names = Vec::new();
while j < curlen { while j < curlen {
let range = cur.as_slice().char_range_at(j); let range = cur.as_slice().char_range_at(j);
@ -584,27 +583,24 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
interpreted correctly interpreted correctly
*/ */
match find_opt(opts.as_slice(), opt.clone()) { let opt_id = match find_opt(opts.as_slice(), opt.clone()) {
Some(id) => last_valid_opt_id = Some(id), Some(id) => id,
None => { None => return Err(UnrecognizedOption(opt.to_string()))
let arg_follows = };
last_valid_opt_id.is_some() &&
match opts[last_valid_opt_id.unwrap()]
.hasarg {
names.push(opt);
let arg_follows = match opts[opt_id].hasarg {
Yes | Maybe => true, Yes | Maybe => true,
No => false No => false
}; };
if arg_follows && j < curlen {
if arg_follows && range.next < curlen {
i_arg = Some(cur.as_slice() i_arg = Some(cur.as_slice()
.slice(j, curlen).to_string()); .slice(range.next, curlen).to_string());
break; break;
} else {
last_valid_opt_id = None;
} }
}
}
names.push(opt);
j = range.next; j = range.next;
} }
} }
@ -617,7 +613,7 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result {
}; };
match opts[optid].hasarg { match opts[optid].hasarg {
No => { No => {
if !i_arg.is_none() { if name_pos == names.len() && !i_arg.is_none() {
return Err(UnexpectedArgument(nm.to_string())); return Err(UnexpectedArgument(nm.to_string()));
} }
vals.get_mut(optid).push(Given); vals.get_mut(optid).push(Given);
@ -1441,6 +1437,21 @@ mod tests {
} }
#[test]
fn test_nospace_conflict() {
let args = vec!("-vvLverbose".to_string(), "-v".to_string() );
let opts = vec!(optmulti("L", "", "library directory", "LIB"),
optflagmulti("v", "verbose", "Verbose"));
let matches = &match getopts(args.as_slice(), opts.as_slice()) {
result::Ok(m) => m,
result::Err(e) => fail!( "{}", e )
};
assert!(matches.opts_present(["L".to_string()]));
assert_eq!(matches.opts_str(["L".to_string()]).unwrap(), "verbose".to_string());
assert!(matches.opts_present(["v".to_string()]));
assert_eq!(3, matches.opt_count("v"));
}
#[test] #[test]
fn test_long_to_short() { fn test_long_to_short() {
let mut short = Opt { let mut short = Opt {