Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
c13f0874
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,发现更多精彩内容 >>
提交
c13f0874
编写于
1月 09, 2012
作者:
M
Marijn Haverbeke
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Properly recognize self as an upvar when closed over
Closes #1463
上级
51364b57
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
27 addition
and
34 deletion
+27
-34
src/comp/middle/resolve.rs
src/comp/middle/resolve.rs
+27
-34
未找到文件。
src/comp/middle/resolve.rs
浏览文件 @
c13f0874
...
...
@@ -845,16 +845,14 @@ fn scope_closes(sc: scope) -> option::t<node_id> {
}
fn
def_is_local
(
d
:
def
)
->
bool
{
ret
alt
d
{
ast
::
def_arg
(
_
,
_
)
|
ast
::
def_local
(
_
,
_
)
|
ast
::
def_binding
(
_
)
|
ast
::
def_upvar
(
_
,
_
,
_
)
{
true
}
_
{
false
}
};
alt
d
{
ast
::
def_arg
(
_
,
_
)
|
ast
::
def_local
(
_
,
_
)
|
ast
::
def_binding
(
_
)
|
ast
::
def_upvar
(
_
,
_
,
_
)
{
true
}
_
{
false
}
}
}
fn
def_
is_obj_field
(
d
:
def
)
->
bool
{
fn
def_
has_obj_scope
(
d
:
def
)
->
bool
{
alt
d
{
ast
::
def_obj_field
(
_
,
_
)
|
ast
::
def_self
(
_
)
{
true
}
_
{
false
}
...
...
@@ -947,37 +945,32 @@ fn in_scope(e: env, sp: span, name: ident, s: scope, ns: namespace) ->
let
fnd
=
in_scope
(
e
,
sp
,
name
,
hd
,
ns
);
if
!
is_none
(
fnd
)
{
let
df
=
option
::
get
(
fnd
);
let
local
=
def_is_local
(
df
);
if
left_fn
&&
local
||
left_fn_level2
&&
def_is_obj_field
(
df
)
||
scope_is_fn
(
hd
)
&&
left_fn
&&
def_is_ty_arg
(
df
)
{
let
msg
=
alt
ns
{
ns_type
.
{
"Attempt to use a type argument out of scope"
}
ns_val
(
v
)
{
alt
(
v
)
{
ns_a_tag
.
{
/* If we were looking for a tag, at this point
we know it's bound to a non-tag value, and
we can return none instead of failing */
ret
none
;
}
_
{
"attempted dynamic environment-capture"
}
}
let
local
=
def_is_local
(
df
),
obj_scope
=
def_has_obj_scope
(
df
);
if
left_fn
&&
local
||
left_fn_level2
&&
obj_scope
||
scope_is_fn
(
hd
)
&&
left_fn
&&
def_is_ty_arg
(
df
)
{
let
msg
=
alt
ns
{
ns_type
.
{
"attempt to use a type argument out of scope"
}
ns_val
(
v
)
{
alt
(
v
)
{
/* If we were looking for a tag, at this point
we know it's bound to a non-tag value, and
we can return none instead of failing */
ns_a_tag
.
{
ret
none
;
}
_
{
"attempted dynamic environment-capture"
}
}
_
{
"attempted dynamic environment-capture"
}
};
}
_
{
"attempted dynamic environment-capture"
}
};
e
.sess
.span_fatal
(
sp
,
msg
);
}
else
if
local
{
}
else
if
local
||
obj_scope
{
let
i
=
vec
::
len
(
closing
);
while
i
>
0u
{
i
-=
1u
;
df
=
ast
::
def_upvar
(
def_id_of_def
(
df
),
@
df
,
closing
[
i
]);
df
=
ast
::
def_upvar
(
def_id_of_def
(
df
),
@
df
,
closing
[
i
]);
fnd
=
some
(
df
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录