Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
562dea18
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,发现更多精彩内容 >>
提交
562dea18
编写于
6月 29, 2013
作者:
H
Huon Wilson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
etc: update etc/unicode.py for the changes made to std::unicode.
上级
9e83b2fe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
12 deletion
+25
-12
src/etc/unicode.py
src/etc/unicode.py
+24
-10
src/libstd/unicode.rs
src/libstd/unicode.rs
+1
-2
未找到文件。
src/etc/unicode.py
浏览文件 @
562dea18
...
@@ -122,14 +122,14 @@ def ch_prefix(ix):
...
@@ -122,14 +122,14 @@ def ch_prefix(ix):
def
emit_bsearch_range_table
(
f
):
def
emit_bsearch_range_table
(
f
):
f
.
write
(
"""
f
.
write
(
"""
pure fn bsearch_range_table(c: char, r: &
[(char,char)]) -> bool {
fn bsearch_range_table(c: char, r: &'static
[(char,char)]) -> bool {
use cmp::{E
Q, LT, GT
};
use cmp::{E
qual, Less, Greater
};
use vec::bsearch;
use vec::bsearch;
use option::None;
use option::None;
(do bsearch(r) |&(lo,hi)| {
(do bsearch(r) |&(lo,hi)| {
if lo <= c && c <= hi { E
Q
}
if lo <= c && c <= hi { E
qual
}
else if hi < c { L
T
}
else if hi < c { L
ess
}
else { G
T
}
else { G
reater
}
}) != None
}) != None
}
\n\n
}
\n\n
"""
);
"""
);
...
@@ -140,7 +140,7 @@ def emit_property_module(f, mod, tbl):
...
@@ -140,7 +140,7 @@ def emit_property_module(f, mod, tbl):
keys
.
sort
()
keys
.
sort
()
emit_bsearch_range_table
(
f
);
emit_bsearch_range_table
(
f
);
for
cat
in
keys
:
for
cat
in
keys
:
f
.
write
(
"
const %s_table : &
[(char,char)] = &[
\n
"
%
cat
)
f
.
write
(
"
static %s_table : &'static
[(char,char)] = &[
\n
"
%
cat
)
ix
=
0
ix
=
0
for
pair
in
tbl
[
cat
]:
for
pair
in
tbl
[
cat
]:
f
.
write
(
ch_prefix
(
ix
))
f
.
write
(
ch_prefix
(
ix
))
...
@@ -148,7 +148,7 @@ def emit_property_module(f, mod, tbl):
...
@@ -148,7 +148,7 @@ def emit_property_module(f, mod, tbl):
ix
+=
1
ix
+=
1
f
.
write
(
"
\n
];
\n\n
"
)
f
.
write
(
"
\n
];
\n\n
"
)
f
.
write
(
" pub
pure
fn %s(c: char) -> bool {
\n
"
%
cat
)
f
.
write
(
" pub fn %s(c: char) -> bool {
\n
"
%
cat
)
f
.
write
(
" bsearch_range_table(c, %s_table)
\n
"
%
cat
)
f
.
write
(
" bsearch_range_table(c, %s_table)
\n
"
%
cat
)
f
.
write
(
" }
\n\n
"
)
f
.
write
(
" }
\n\n
"
)
f
.
write
(
"}
\n
"
)
f
.
write
(
"}
\n
"
)
...
@@ -159,7 +159,7 @@ def emit_property_module_old(f, mod, tbl):
...
@@ -159,7 +159,7 @@ def emit_property_module_old(f, mod, tbl):
keys
=
tbl
.
keys
()
keys
=
tbl
.
keys
()
keys
.
sort
()
keys
.
sort
()
for
cat
in
keys
:
for
cat
in
keys
:
f
.
write
(
"
pure
fn %s(c: char) -> bool {
\n
"
%
cat
)
f
.
write
(
" fn %s(c: char) -> bool {
\n
"
%
cat
)
f
.
write
(
" ret alt c {
\n
"
)
f
.
write
(
" ret alt c {
\n
"
)
prefix
=
' '
prefix
=
' '
for
pair
in
tbl
[
cat
]:
for
pair
in
tbl
[
cat
]:
...
@@ -236,8 +236,22 @@ rf = open(r, "w")
...
@@ -236,8 +236,22 @@ rf = open(r, "w")
(
canon_decomp
,
compat_decomp
,
gencats
)
=
load_unicode_data
(
"UnicodeData.txt"
)
(
canon_decomp
,
compat_decomp
,
gencats
)
=
load_unicode_data
(
"UnicodeData.txt"
)
# Explain that the source code was generated by this script.
# Preamble
rf
.
write
(
'// The following code was generated by "src/etc/unicode.py"
\n\n
'
)
rf
.
write
(
'''// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// The following code was generated by "src/etc/unicode.py"
#[allow(missing_doc)];
'''
)
emit_property_module
(
rf
,
"general_category"
,
gencats
)
emit_property_module
(
rf
,
"general_category"
,
gencats
)
...
...
src/libstd/unicode.rs
浏览文件 @
562dea18
...
@@ -1447,10 +1447,8 @@ pub fn Zs(c: char) -> bool {
...
@@ -1447,10 +1447,8 @@ pub fn Zs(c: char) -> bool {
}
}
}
}
pub
mod
derived_property
{
pub
mod
derived_property
{
fn
bsearch_range_table
(
c
:
char
,
r
:
&
'static
[(
char
,
char
)])
->
bool
{
fn
bsearch_range_table
(
c
:
char
,
r
:
&
'static
[(
char
,
char
)])
->
bool
{
use
cmp
::{
Equal
,
Less
,
Greater
};
use
cmp
::{
Equal
,
Less
,
Greater
};
use
vec
::
bsearch
;
use
vec
::
bsearch
;
...
@@ -2641,4 +2639,5 @@ pub fn XID_Continue(c: char) -> bool {
...
@@ -2641,4 +2639,5 @@ pub fn XID_Continue(c: char) -> bool {
pub
fn
XID_Start
(
c
:
char
)
->
bool
{
pub
fn
XID_Start
(
c
:
char
)
->
bool
{
bsearch_range_table
(
c
,
XID_Start_table
)
bsearch_range_table
(
c
,
XID_Start_table
)
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录