OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor to make combine less inherently commutative

Browse Source
This commit is contained in:
Niko Matsakis 2012-04-06 08:03:59 -07:00
parent 2c56ba7e43
commit 4856eab844
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rustc/middle/infer.rs
View File

@ -978,6 +978,10 @@ iface combine {
fn c_regions_scope_scope(
a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id) -> cres<ty::region>;
fn c_regions_scope_free(
a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
-> cres<ty::region>;
fn c_regions_free_scope(
a: ty::region, a_id: ast::node_id, a_br: ty::bound_region,
b: ty::region, b_id: ast::node_id) -> cres<ty::region>;
@ -1327,9 +1331,12 @@ fn c_regions<C:combine>(
{|x, y| self.c_regions(x, y) })
}
(f @ ty::re_free(f_id, f_br), s @ ty::re_scope(s_id)) |
(s @ ty::re_scope(s_id), f @ ty::re_free(f_id, f_br)) {
self.c_regions_free_scope(f, f_id, f_br, s, s_id)
(ty::re_free(a_id, a_br), ty::re_scope(b_id)) {
self.c_regions_free_scope(a, a_id, a_br, b, b_id)
}
(ty::re_scope(a_id), ty::re_free(b_id, b_br)) {
self.c_regions_scope_free(b, b_id, b, b_id, b_br)
}
(ty::re_scope(a_id), ty::re_scope(b_id)) {
@ -1473,6 +1480,15 @@ impl of combine for lub {
ret ok(a); // NDM--not so for nested functions
}
fn c_regions_scope_free(
a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
-> cres<ty::region> {
// LUB is commutative:
self.c_regions_free_scope(b, b_id, b_br, a, a_id)
}
fn c_regions_scope_scope(a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id)
-> cres<ty::region> {
@ -1614,6 +1630,15 @@ impl of combine for glb {
ret ok(b); // NDM--not so for nested functions
}
fn c_regions_scope_free(
a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
-> cres<ty::region> {
// GLB is commutative:
self.c_regions_free_scope(b, b_id, b_br, a, a_id)
}
fn c_regions_scope_scope(a: ty::region, a_id: ast::node_id,
b: ty::region, b_id: ast::node_id)
-> cres<ty::region> {