Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
8f6603f5
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8f6603f5
编写于
4月 17, 2011
作者:
B
Brian Anderson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support #fmt precision for signed types
上级
4c0aea69
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
66 addition
and
49 deletion
+66
-49
src/lib/ExtFmt.rs
src/lib/ExtFmt.rs
+46
-37
src/test/run-pass/syntax-extension-fmt.rs
src/test/run-pass/syntax-extension-fmt.rs
+20
-12
未找到文件。
src/lib/ExtFmt.rs
浏览文件 @
8f6603f5
...
@@ -332,46 +332,13 @@ mod RT {
...
@@ -332,46 +332,13 @@ mod RT {
ty
ty
);
ty
ty
);
fn
conv_int
(
&
conv
cv
,
int
i
)
->
str
{
fn
conv_int
(
&
conv
cv
,
int
i
)
->
str
{
ret
pad
(
cv
,
_
int
.to_str
(
i
,
10u
));
auto
radix
=
10u
;
auto
prec
=
get_int_precision
(
cv
);
ret
pad
(
cv
,
int_to_str_prec
(
i
,
radix
,
prec
));
}
}
fn
conv_uint
(
&
conv
cv
,
uint
u
)
->
str
{
fn
conv_uint
(
&
conv
cv
,
uint
u
)
->
str
{
auto
prec
=
get_int_precision
(
cv
);
// Convert a uint to string with a minimum number of digits. If
// precision is 0 and num is 0 then the result is the empty
// string. Could move this to _str, but it doesn't seem all that
// useful.
fn
uint_to_str_prec
(
uint
num
,
uint
radix
,
uint
prec
)
->
str
{
auto
s
;
if
(
prec
==
0u
&&
num
==
0u
)
{
s
=
""
;
}
else
{
s
=
_u
int
.to_str
(
num
,
radix
);
auto
len
=
_
str
.char_len
(
s
);
if
(
len
<
prec
)
{
auto
diff
=
prec
-
len
;
auto
pad
=
str_init_elt
(
'0'
,
diff
);
s
=
pad
+
s
;
}
}
ret
s
;
}
fn
get_precision
(
&
conv
cv
)
->
uint
{
alt
(
cv
.precision
)
{
case
(
count_is
(
?
c
))
{
ret
c
as
uint
;
}
case
(
count_implied
)
{
ret
1u
;
}
}
}
auto
prec
=
get_precision
(
cv
);
auto
res
;
auto
res
;
alt
(
cv
.ty
)
{
alt
(
cv
.ty
)
{
case
(
ty_default
)
{
case
(
ty_default
)
{
...
@@ -418,6 +385,48 @@ fn conv_str(&conv cv, str s) -> str {
...
@@ -418,6 +385,48 @@ fn conv_str(&conv cv, str s) -> str {
ret
pad
(
cv
,
unpadded
);
ret
pad
(
cv
,
unpadded
);
}
}
// Convert an int to string with minimum number of digits. If precision is
// 0 and num is 0 then the result is the empty string.
fn
int_to_str_prec
(
int
num
,
uint
radix
,
uint
prec
)
->
str
{
if
(
num
<
0
)
{
ret
"-"
+
uint_to_str_prec
((
-
num
)
as
uint
,
radix
,
prec
);
}
else
{
ret
uint_to_str_prec
(
num
as
uint
,
radix
,
prec
);
}
}
// Convert a uint to string with a minimum number of digits. If precision
// is 0 and num is 0 then the result is the empty string. Could move this
// to _uint, but it doesn't seem all that useful.
fn
uint_to_str_prec
(
uint
num
,
uint
radix
,
uint
prec
)
->
str
{
auto
s
;
if
(
prec
==
0u
&&
num
==
0u
)
{
s
=
""
;
}
else
{
s
=
_u
int
.to_str
(
num
,
radix
);
auto
len
=
_
str
.char_len
(
s
);
if
(
len
<
prec
)
{
auto
diff
=
prec
-
len
;
auto
pad
=
str_init_elt
(
'0'
,
diff
);
s
=
pad
+
s
;
}
}
ret
s
;
}
fn
get_int_precision
(
&
conv
cv
)
->
uint
{
alt
(
cv
.precision
)
{
case
(
count_is
(
?
c
))
{
ret
c
as
uint
;
}
case
(
count_implied
)
{
ret
1u
;
}
}
}
// FIXME: This might be useful in _str, but needs to be utf8 safe first
// FIXME: This might be useful in _str, but needs to be utf8 safe first
fn
str_init_elt
(
char
c
,
uint
n_elts
)
->
str
{
fn
str_init_elt
(
char
c
,
uint
n_elts
)
->
str
{
auto
svec
=
_
vec
.init_elt
[
u8
](
c
as
u8
,
n_elts
);
auto
svec
=
_
vec
.init_elt
[
u8
](
c
as
u8
,
n_elts
);
...
...
src/test/run-pass/syntax-extension-fmt.rs
浏览文件 @
8f6603f5
...
@@ -55,39 +55,47 @@ fn main() {
...
@@ -55,39 +55,47 @@ fn main() {
test
(
#
fmt
(
"%-10t"
,
0xff_u
),
"11111111 "
);
test
(
#
fmt
(
"%-10t"
,
0xff_u
),
"11111111 "
);
// Precision
// Precision
//
test(#fmt("%.d", 0), "");
test
(
#
fmt
(
"%.d"
,
0
),
""
);
test
(
#
fmt
(
"%.u"
,
0u
),
""
);
test
(
#
fmt
(
"%.u"
,
0u
),
""
);
test
(
#
fmt
(
"%.x"
,
0u
),
""
);
test
(
#
fmt
(
"%.x"
,
0u
),
""
);
// test(#fmt("%.d", 10), "10");
test
(
#
fmt
(
"%.t"
,
0u
),
""
);
// test(#fmt("%.d", -10), "-10");
test
(
#
fmt
(
"%.d"
,
10
),
"10"
);
test
(
#
fmt
(
"%.d"
,
-
10
),
"-10"
);
test
(
#
fmt
(
"%.u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.s"
,
"test"
),
""
);
test
(
#
fmt
(
"%.s"
,
"test"
),
""
);
test
(
#
fmt
(
"%.x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.t"
,
3u
),
"11"
);
//
test(#fmt("%.0d", 0), "");
test
(
#
fmt
(
"%.0d"
,
0
),
""
);
test
(
#
fmt
(
"%.0u"
,
0u
),
""
);
test
(
#
fmt
(
"%.0u"
,
0u
),
""
);
test
(
#
fmt
(
"%.0x"
,
0u
),
""
);
test
(
#
fmt
(
"%.0x"
,
0u
),
""
);
// test(#fmt("%.0d", 10), "10");
test
(
#
fmt
(
"%.0t"
,
0u
),
""
);
// test(#fmt("%.0d", -10), "-10");
test
(
#
fmt
(
"%.0d"
,
10
),
"10"
);
test
(
#
fmt
(
"%.0d"
,
-
10
),
"-10"
);
test
(
#
fmt
(
"%.0u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.0u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.0s"
,
"test"
),
""
);
test
(
#
fmt
(
"%.0s"
,
"test"
),
""
);
test
(
#
fmt
(
"%.0x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.0x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.0t"
,
3u
),
"11"
);
//
test(#fmt("%.1d", 0), "0");
test
(
#
fmt
(
"%.1d"
,
0
),
"0"
);
test
(
#
fmt
(
"%.1u"
,
0u
),
"0"
);
test
(
#
fmt
(
"%.1u"
,
0u
),
"0"
);
test
(
#
fmt
(
"%.1x"
,
0u
),
"0"
);
test
(
#
fmt
(
"%.1x"
,
0u
),
"0"
);
// test(#fmt("%.1d", 10), "10");
test
(
#
fmt
(
"%.1t"
,
0u
),
"0"
);
// test(#fmt("%.1d", -10), "-10");
test
(
#
fmt
(
"%.1d"
,
10
),
"10"
);
test
(
#
fmt
(
"%.1d"
,
-
10
),
"-10"
);
test
(
#
fmt
(
"%.1u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.1u"
,
10u
),
"10"
);
test
(
#
fmt
(
"%.1s"
,
"test"
),
"t"
);
test
(
#
fmt
(
"%.1s"
,
"test"
),
"t"
);
test
(
#
fmt
(
"%.1x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.1x"
,
127u
),
"7f"
);
test
(
#
fmt
(
"%.1t"
,
3u
),
"11"
);
//
test(#fmt("%.5d", 0), "00000");
test
(
#
fmt
(
"%.5d"
,
0
),
"00000"
);
test
(
#
fmt
(
"%.5u"
,
0u
),
"00000"
);
test
(
#
fmt
(
"%.5u"
,
0u
),
"00000"
);
test
(
#
fmt
(
"%.5x"
,
0u
),
"00000"
);
test
(
#
fmt
(
"%.5x"
,
0u
),
"00000"
);
// test(#fmt("%.5d", 10), "00010");
test
(
#
fmt
(
"%.5t"
,
0u
),
"00000"
);
// test(#fmt("%.5d", -10), "-00010");
test
(
#
fmt
(
"%.5d"
,
10
),
"00010"
);
test
(
#
fmt
(
"%.5d"
,
-
10
),
"-00010"
);
test
(
#
fmt
(
"%.5u"
,
10u
),
"00010"
);
test
(
#
fmt
(
"%.5u"
,
10u
),
"00010"
);
test
(
#
fmt
(
"%.5s"
,
"test"
),
"test"
);
test
(
#
fmt
(
"%.5s"
,
"test"
),
"test"
);
test
(
#
fmt
(
"%.5x"
,
127u
),
"0007f"
);
test
(
#
fmt
(
"%.5x"
,
127u
),
"0007f"
);
test
(
#
fmt
(
"%.5t"
,
3u
),
"00011"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录