Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
dbf4e19e
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,发现更多精彩内容 >>
提交
dbf4e19e
编写于
7月 11, 2013
作者:
J
John Clements
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove unneeded imports, clean up unused var warnings
上级
60562ac9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
16 deletion
+15
-16
src/libsyntax/ext/base.rs
src/libsyntax/ext/base.rs
+2
-2
src/libsyntax/ext/expand.rs
src/libsyntax/ext/expand.rs
+7
-7
src/libsyntax/parse/token.rs
src/libsyntax/parse/token.rs
+2
-5
src/libsyntax/print/pprust.rs
src/libsyntax/print/pprust.rs
+4
-2
未找到文件。
src/libsyntax/ext/base.rs
浏览文件 @
dbf4e19e
...
...
@@ -135,13 +135,13 @@ pub fn syntax_expander_table() -> SyntaxEnv {
// utility function to simplify creating NormalTT syntax extensions
// that ignore their contexts
fn
builtin_normal_tt_no_ctxt
(
f
:
SyntaxExpanderTTFunNoCtxt
)
->
@
Transformer
{
let
wrapped_expander
:
SyntaxExpanderTTFun
=
|
a
,
b
,
c
,
d
|{
f
(
a
,
b
,
c
)};
let
wrapped_expander
:
SyntaxExpanderTTFun
=
|
a
,
b
,
c
,
_
d
|{
f
(
a
,
b
,
c
)};
@
SE
(
NormalTT
(
wrapped_expander
,
None
))
}
// utility function to simplify creating IdentTT syntax extensions
// that ignore their contexts
fn
builtin_item_tt_no_ctxt
(
f
:
SyntaxExpanderTTItemFunNoCtxt
)
->
@
Transformer
{
let
wrapped_expander
:
SyntaxExpanderTTItemFun
=
|
a
,
b
,
c
,
d
,
e
|{
f
(
a
,
b
,
c
,
d
)};
let
wrapped_expander
:
SyntaxExpanderTTItemFun
=
|
a
,
b
,
c
,
d
,
_
e
|{
f
(
a
,
b
,
c
,
d
)};
@
SE
(
IdentTT
(
wrapped_expander
,
None
))
}
let
mut
syntax_expanders
=
HashMap
::
new
();
...
...
src/libsyntax/ext/expand.rs
浏览文件 @
dbf4e19e
...
...
@@ -8,12 +8,12 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use
ast
::{
Block
,
Crate
,
NodeId
,
DeclLocal
,
E
MPTY_CTXT
,
E
xpr_
,
ExprMac
,
SyntaxContext
};
use
ast
::{
Block
,
Crate
,
NodeId
,
DeclLocal
,
Expr_
,
ExprMac
,
SyntaxContext
};
use
ast
::{
Local
,
Ident
,
mac_invoc_tt
};
use
ast
::{
item_mac
,
Mrk
,
Stmt_
,
StmtDecl
,
StmtMac
,
StmtExpr
,
StmtSemi
};
use
ast
::{
ILLEGAL_CTXT
,
SCTable
,
token_tree
};
use
ast
::{
token_tree
};
use
ast
;
use
ast_util
::{
new_rename
,
new_mark
,
mtwt_resolve
};
use
ast_util
::{
new_rename
,
new_mark
};
use
attr
;
use
attr
::
AttrMetaMethods
;
use
codemap
;
...
...
@@ -585,7 +585,7 @@ fn expand_non_macro_stmt (exts: SyntaxEnv,
let
new_name
=
fresh_name
(
ident
);
new_pending_renames
.push
((
*
ident
,
new_name
));
}
let
mut
rename_fld
=
renames_to_fold
(
new_pending_renames
);
let
rename_fld
=
renames_to_fold
(
new_pending_renames
);
// rewrite the pattern using the new names (the old ones
// have already been applied):
let
rewritten_pat
=
rename_fld
.fold_pat
(
expanded_pat
);
...
...
@@ -906,7 +906,7 @@ pub fn expand_block(extsbox: @mut SyntaxEnv,
_
cx
:
@
ExtCtxt
,
blk
:
&
Block
,
fld
:
@
ast_fold
,
orig
:
@
fn
(
&
Block
,
@
ast_fold
)
->
Block
)
_
orig
:
@
fn
(
&
Block
,
@
ast_fold
)
->
Block
)
->
Block
{
// see note below about treatment of exts table
with_exts_frame!
(
extsbox
,
false
,
...
...
@@ -917,7 +917,7 @@ pub fn expand_block(extsbox: @mut SyntaxEnv,
pub
fn
expand_block_elts
(
exts
:
SyntaxEnv
,
b
:
&
Block
,
fld
:
@
ast_fold
)
->
Block
{
let
block_info
=
get_block_info
(
exts
);
let
pending_renames
=
block_info
.pending_renames
;
let
mut
rename_fld
=
renames_to_fold
(
pending_renames
);
let
rename_fld
=
renames_to_fold
(
pending_renames
);
let
new_view_items
=
b
.view_items
.map
(|
x
|
fld
.fold_view_item
(
x
));
let
mut
new_stmts
=
~
[];
for
x
in
b
.stmts
.iter
()
{
...
...
@@ -1456,7 +1456,7 @@ fn f(&self, ctxt : ast::SyntaxContext) -> ast::SyntaxContext {
pub
struct
Repainter
{
ctxt
:
SyntaxContext
}
impl
CtxtFn
for
Repainter
{
fn
f
(
&
self
,
ctxt
:
ast
::
SyntaxContext
)
->
ast
::
SyntaxContext
{
fn
f
(
&
self
,
_
ctxt
:
ast
::
SyntaxContext
)
->
ast
::
SyntaxContext
{
self
.ctxt
}
}
...
...
src/libsyntax/parse/token.rs
浏览文件 @
dbf4e19e
...
...
@@ -17,10 +17,7 @@
use
std
::
cast
;
use
std
::
char
;
use
std
::
cmp
::
Equiv
;
use
std
::
local_data
;
use
std
::
rand
;
use
std
::
rand
::
RngUtil
;
#[deriving(Clone,
Encodable,
Decodable,
Eq,
IterBytes)]
pub
enum
binop
{
...
...
@@ -565,8 +562,8 @@ pub fn str_ptr_eq(a : @str, b : @str) -> bool {
let
q
:
uint
=
cast
::
transmute
(
b
);
let
result
=
p
==
q
;
// got to transmute them back, to make sure the ref count is correct:
let
junk1
:
@
str
=
cast
::
transmute
(
p
);
let
junk2
:
@
str
=
cast
::
transmute
(
q
);
let
_
junk1
:
@
str
=
cast
::
transmute
(
p
);
let
_
junk2
:
@
str
=
cast
::
transmute
(
q
);
result
}
}
...
...
src/libsyntax/print/pprust.rs
浏览文件 @
dbf4e19e
...
...
@@ -619,7 +619,8 @@ pub fn print_item(s: @ps, item: &ast::item) {
}
bclose
(
s
,
item
.span
);
}
ast
::
item_mac
(
codemap
::
Spanned
{
node
:
ast
::
mac_invoc_tt
(
ref
pth
,
ref
tts
,
ctxt
),
// I think it's reasonable to hide the context here:
ast
::
item_mac
(
codemap
::
Spanned
{
node
:
ast
::
mac_invoc_tt
(
ref
pth
,
ref
tts
,
_
),
_
})
=>
{
print_visibility
(
s
,
item
.vis
);
print_path
(
s
,
pth
,
false
);
...
...
@@ -1021,7 +1022,8 @@ fn do_else(s: @ps, els: Option<@ast::Expr>) {
pub
fn
print_mac
(
s
:
@
ps
,
m
:
&
ast
::
mac
)
{
match
m
.node
{
ast
::
mac_invoc_tt
(
ref
pth
,
ref
tts
,
ctxt
)
=>
{
// I think it's reasonable to hide the ctxt here:
ast
::
mac_invoc_tt
(
ref
pth
,
ref
tts
,
_
)
=>
{
print_path
(
s
,
pth
,
false
);
word
(
s
.s
,
"!"
);
popen
(
s
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录