Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
vnotepad
Exa
提交
c9f6c450
E
Exa
项目概览
vnotepad
/
Exa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
Exa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c9f6c450
编写于
7月 13, 2017
作者:
B
Benjamin Sago
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add missing short arg functionality
上级
c41005a1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
54 addition
and
7 deletion
+54
-7
src/options/parser.rs
src/options/parser.rs
+54
-7
未找到文件。
src/options/parser.rs
浏览文件 @
c9f6c450
...
...
@@ -120,7 +120,17 @@ fn parse<'a>(args: Args, inputs: &'a [OsString]) -> Result<Matches<'a>, ParseErr
else
if
bytes
.starts_with
(
b
"-"
)
&&
arg
!=
"-"
{
let
short_arg
=
OsStr
::
from_bytes
(
&
bytes
[
1
..
]);
if
let
Some
((
before
,
after
))
=
split_on_equals
(
short_arg
)
{
// TODO: remember to deal with the other bytes!
let
(
arg_with_value
,
other_args
)
=
before
.as_bytes
()
.split_last
()
.unwrap
();
for
byte
in
other_args
{
let
arg
=
args
.lookup_short
(
*
byte
)
?
;
let
flag
=
Flag
::
Short
(
*
byte
);
match
arg
.takes_value
{
Forbidden
=>
results
.flags
.push
((
flag
,
None
)),
Necessary
=>
return
Err
(
ParseError
::
NeedsValue
{
flag
})
}
}
let
arg
=
args
.lookup_short
(
*
before
.as_bytes
()
.last
()
.unwrap
())
?
;
let
flag
=
Flag
::
Short
(
arg
.short
.unwrap
());
match
arg
.takes_value
{
...
...
@@ -129,15 +139,18 @@ fn parse<'a>(args: Args, inputs: &'a [OsString]) -> Result<Matches<'a>, ParseErr
}
}
else
{
for
byte
in
&
bytes
[
1
..
]
{
// TODO: gotta check that these don't take arguments
// like -c4
for
(
index
,
byte
)
in
bytes
.into_iter
()
.enumerate
()
.skip
(
1
)
{
let
arg
=
args
.lookup_short
(
*
byte
)
?
;
let
flag
=
Flag
::
Short
(
*
byte
);
match
arg
.takes_value
{
Forbidden
=>
results
.flags
.push
((
flag
,
None
)),
Necessary
=>
{
if
let
Some
(
next_arg
)
=
iter
.next
()
{
if
index
<
bytes
.len
()
-
1
{
let
remnants
=
&
bytes
[
index
+
1
..
];
results
.flags
.push
((
flag
,
Some
(
OsStr
::
from_bytes
(
remnants
))));
break
;
}
else
if
let
Some
(
next_arg
)
=
iter
.next
()
{
results
.flags
.push
((
flag
,
Some
(
next_arg
)));
}
else
{
...
...
@@ -224,8 +237,9 @@ mod test {
use
super
::
*
;
static
TEST_ARGS
:
&
'static
[
Arg
]
=
&
[
Arg
{
short
:
Some
(
b
'l'
),
long
:
"long"
,
takes_value
:
TakesValue
::
Forbidden
},
Arg
{
short
:
Some
(
b
'c'
),
long
:
"count"
,
takes_value
:
TakesValue
::
Necessary
}
Arg
{
short
:
Some
(
b
'l'
),
long
:
"long"
,
takes_value
:
TakesValue
::
Forbidden
},
Arg
{
short
:
Some
(
b
'v'
),
long
:
"verbose"
,
takes_value
:
TakesValue
::
Forbidden
},
Arg
{
short
:
Some
(
b
'c'
),
long
:
"count"
,
takes_value
:
TakesValue
::
Necessary
}
];
#[test]
...
...
@@ -289,6 +303,12 @@ mod test {
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[
os
(
"4"
)
.as_os_str
()
],
flags
:
vec!
[
(
Flag
::
Long
(
"long"
),
None
)
]
}))
}
#[test]
fn
two_long_flags
()
{
let
bits
=
[
os
(
"--long"
),
os
(
"--verbose"
)
];
let
results
=
parse
(
Args
(
TEST_ARGS
),
&
bits
);
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Long
(
"long"
),
None
),
(
Flag
::
Long
(
"verbose"
),
None
)
]
}))
}
#[test]
fn
no_arg_given
()
{
...
...
@@ -369,4 +389,31 @@ mod test {
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Short
(
b
'c'
),
Some
(
os
(
"4"
)
.as_os_str
()))
]
}))
}
#[test]
fn
two_short_flags
()
{
let
bits
=
[
os
(
"-lv"
)
];
let
results
=
parse
(
Args
(
TEST_ARGS
),
&
bits
);
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Short
(
b
'l'
),
None
),
(
Flag
::
Short
(
b
'v'
),
None
)
]
}))
}
#[test]
fn
two_short_flags_nothing
()
{
let
bits
=
[
os
(
"-lctwo"
)
];
let
results
=
parse
(
Args
(
TEST_ARGS
),
&
bits
);
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Short
(
b
'l'
),
None
),
(
Flag
::
Short
(
b
'c'
),
Some
(
os
(
"two"
)
.as_os_str
()))
]
}))
}
#[test]
fn
two_short_flags_equals
()
{
let
bits
=
[
os
(
"-lc=two"
)
];
let
results
=
parse
(
Args
(
TEST_ARGS
),
&
bits
);
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Short
(
b
'l'
),
None
),
(
Flag
::
Short
(
b
'c'
),
Some
(
os
(
"two"
)
.as_os_str
()))
]
}))
}
#[test]
fn
two_short_flags_next
()
{
let
bits
=
[
os
(
"-lc"
),
os
(
"two"
)
];
let
results
=
parse
(
Args
(
TEST_ARGS
),
&
bits
);
assert_eq!
(
results
,
Ok
(
Matches
{
frees
:
vec!
[],
flags
:
vec!
[
(
Flag
::
Short
(
b
'l'
),
None
),
(
Flag
::
Short
(
b
'c'
),
Some
(
os
(
"two"
)
.as_os_str
()))
]
}))
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录