rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Add a version of demand that takes in a set of region variable bindings

Browse Source
This commit is contained in:
Patrick Walton
2012-03-21 14:14:21 -07:00
parent 30c272cb3a
commit bdf968c9d9
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rustc/middle/ty.rs
View File

@@ -1542,8 +1542,8 @@ mod unify {
export resolve_type_structure;
export resolve_type_var;
export unify;
export var_bindings;
export precise, in_bindings;
export var_bindings, region_bindings;
export precise, in_bindings, in_region_bindings;
type ures<T> = result<T,type_err>;
@@ -1669,7 +1669,11 @@ mod unify {
typ: t, variance: variance,
nxt: fn(t) -> ures<T>) -> ures<T> {
let vb = alt check cx.st { in_bindings(vb) { vb } };
let vb = alt cx.st {
in_bindings(vb) | in_region_bindings(vb, _) { vb }
precise { fail; }
};
ufind::grow(vb.sets, (key as uint) + 1u);
let root = ufind::find(vb.sets, key as uint);
let result_type = typ;

32
src/rustc/middle/typeck.rs
View File

@@ -1089,6 +1089,15 @@ mod collect {
// Type unification
mod unify {
fn unify_with_region_bindings(fcx: @fn_ctxt,
rb: @ty::unify::region_bindings,
expected: ty::t,
actual: ty::t)
-> result<ty::t, ty::type_err> {
let irb = ty::unify::in_region_bindings(fcx.var_bindings, rb);
ret ty::unify::unify(expected, actual, irb, fcx.ccx.tcx);
}
fn unify(fcx: @fn_ctxt, expected: ty::t, actual: ty::t) ->
result<ty::t, ty::type_err> {
ret ty::unify::unify(expected, actual,
@@ -1146,17 +1155,32 @@ type ty_param_substs_and_ty = {substs: [ty::t], ty: ty::t};
mod demand {
fn simple(fcx: @fn_ctxt, sp: span, expected: ty::t, actual: ty::t) ->
ty::t {
full(fcx, sp, expected, actual, []).ty
full(fcx, sp, unify::unify, expected, actual, []).ty
}
fn with_region_bindings(fcx: @fn_ctxt,
sp: span,
rb: @ty::unify::region_bindings,
expected: ty::t,
actual: ty::t)
-> ty::t {
full(fcx, sp, bind unify::unify_with_region_bindings(_, rb, _, _),
expected, actual, []).ty
}
fn with_substs(fcx: @fn_ctxt, sp: span, expected: ty::t, actual: ty::t,
ty_param_substs_0: [ty::t]) -> ty_param_substs_and_ty {
full(fcx, sp, expected, actual, ty_param_substs_0)
full(fcx, sp, unify::unify, expected, actual, ty_param_substs_0)
}
// Requires that the two types unify, and prints an error message if they
// don't. Returns the unified type and the type parameter substitutions.
fn full(fcx: @fn_ctxt, sp: span, expected: ty::t, actual: ty::t,
fn full(fcx: @fn_ctxt,
sp: span,
unifier: fn@(@fn_ctxt, ty::t, ty::t)
-> result<ty::t, ty::type_err>,
expected: ty::t,
actual: ty::t,
ty_param_substs_0: [ty::t]) ->
ty_param_substs_and_ty {
@@ -1183,7 +1207,7 @@ mod demand {
}
alt unify::unify(fcx, expected, actual) {
alt unifier(fcx, expected, actual) {
result::ok(t) { ret mk_result(fcx, t, ty_param_subst_var_ids); }
result::err(err) {
let e_err = resolve_type_vars_if_possible(fcx, expected);