Skip to content

Parse options without names vector #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2019
Merged

Parse options without names vector #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ impl Options {
free.extend(args);
break;
} else {
let mut names;
let mut name = None;
let mut i_arg = None;
let mut was_long = true;
if cur.as_bytes()[1] == b'-' || self.long_only {
Expand All @@ -383,57 +383,53 @@ impl Options {
&cur[1..]
};
let mut parts = tail.splitn(2, '=');
names = vec![Name::from_str(parts.next().unwrap())];
name = Some(Name::from_str(parts.next().unwrap()));
if let Some(rest) = parts.next() {
i_arg = Some(rest.to_string());
}
} else {
was_long = false;
names = Vec::new();
for (j, ch) in cur.char_indices().skip(1) {
let opt = Short(ch);

/* In a series of potential options (eg. -aheJ), if we
see one which takes an argument, we assume all
subsequent characters make up the argument. This
allows options such as -L/usr/local/lib/foo to be
interpreted correctly
*/

let opt_id = match find_opt(&opts, &opt) {
Some(id) => id,
None => return Err(UnrecognizedOption(opt.to_string())),
};

names.push(opt);

// In a series of potential options (eg. -aheJ), if we
// see one which takes an argument, we assume all
// subsequent characters make up the argument. This
// allows options such as -L/usr/local/lib/foo to be
// interpreted correctly
let arg_follows = match opts[opt_id].hasarg {
Yes | Maybe => true,
No => false,
};

if arg_follows {
name = Some(opt);
let next = j + ch.len_utf8();
if next < cur.len() {
i_arg = Some(cur[next..].to_string());
break;
}
} else {
vals[opt_id].push((arg_pos, Given));
}
}
}
let mut name_pos = 0;
for nm in names.iter() {
name_pos += 1;
let optid = match find_opt(&opts, &nm) {
if let Some(nm) = name {
let opt_id = match find_opt(&opts, &nm) {
Some(id) => id,
None => return Err(UnrecognizedOption(nm.to_string())),
};
match opts[optid].hasarg {
match opts[opt_id].hasarg {
No => {
if name_pos == names.len() && i_arg.is_some() {
if i_arg.is_some() {
return Err(UnexpectedArgument(nm.to_string()));
}
vals[optid].push((arg_pos, Given));
vals[opt_id].push((arg_pos, Given));
}
Maybe => {
// Note that here we do not handle `--arg value`.
Expand All @@ -443,21 +439,20 @@ impl Options {
// option at the end of the arguments when
// FloatingFrees is in use.
if let Some(i_arg) = i_arg.take() {
vals[optid].push((arg_pos, Val(i_arg)));
vals[opt_id].push((arg_pos, Val(i_arg)));
} else if was_long
|| name_pos < names.len()
|| args.peek().map_or(true, |n| is_arg(&n))
{
vals[optid].push((arg_pos, Given));
vals[opt_id].push((arg_pos, Given));
} else {
vals[optid].push((arg_pos, Val(args.next().unwrap())));
vals[opt_id].push((arg_pos, Val(args.next().unwrap())));
}
}
Yes => {
if let Some(i_arg) = i_arg.take() {
vals[optid].push((arg_pos, Val(i_arg)));
vals[opt_id].push((arg_pos, Val(i_arg)));
} else if let Some(n) = args.next() {
vals[optid].push((arg_pos, Val(n)));
vals[opt_id].push((arg_pos, Val(n)));
} else {
return Err(ArgumentMissing(nm.to_string()));
}
Expand Down