bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

For consistency, use ctxt instead of ty_ctxt outside of unify.

Browse source
This commit is contained in:
Lindsey Kuper 2011-06-07 15:07:27 -07:00
parent ab69c4a98f
commit a4ca75e6af
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/comp/middle/ty.rs
View file

@ -1542,25 +1542,25 @@ fn eq_ty(&t a, &t b) -> bool { ret a == b; }
// Type lookups // Type lookups
fn ann_to_ty_param_substs_opt_and_ty(&ty_ctxt tcx, &ast::ann ann) fn ann_to_ty_param_substs_opt_and_ty(&ctxt cx, &ast::ann ann)
-> ty_param_substs_opt_and_ty { -> ty_param_substs_opt_and_ty {
// Pull out the node type table. // Pull out the node type table.
alt ({tcx.node_types.(ann.id)}) { alt ({cx.node_types.(ann.id)}) {
case (none) { case (none) {
tcx.sess.bug("ann_to_ty_param_substs_opt_and_ty() called on an " + cx.sess.bug("ann_to_ty_param_substs_opt_and_ty() called on an " +
"untyped node"); "untyped node");
} }
case (some(?tpot)) { ret tpot; } case (some(?tpot)) { ret tpot; }
} }
} }
fn ann_to_type(&ty_ctxt tcx, &ast::ann ann) -> t { fn ann_to_type(&ctxt cx, &ast::ann ann) -> t {
ret ann_to_ty_param_substs_opt_and_ty(tcx, ann)._1; ret ann_to_ty_param_substs_opt_and_ty(cx, ann)._1;
} }
fn ann_to_type_params(&ty_ctxt tcx, &ast::ann ann) -> vec[t] { fn ann_to_type_params(&ctxt cx, &ast::ann ann) -> vec[t] {
alt (ann_to_ty_param_substs_opt_and_ty(tcx, ann)._0) { alt (ann_to_ty_param_substs_opt_and_ty(cx, ann)._0) {
case (none) { case (none) {
let vec[t] result = []; let vec[t] result = [];
ret result; ret result;
@ -1569,8 +1569,8 @@ fn ann_to_type_params(&ty_ctxt tcx, &ast::ann ann) -> vec[t] {
} }
} }
fn ann_has_type_params(&ty_ctxt tcx, &ast::ann ann) -> bool { fn ann_has_type_params(&ctxt cx, &ast::ann ann) -> bool {
auto tpt = ann_to_ty_param_substs_opt_and_ty(tcx, ann); auto tpt = ann_to_ty_param_substs_opt_and_ty(cx, ann);
ret !option::is_none[vec[t]](tpt._0); ret !option::is_none[vec[t]](tpt._0);
} }
@ -1765,8 +1765,8 @@ fn expr_ty_params_and_ty(&ctxt cx, &@ast::expr expr)
ann_to_type(cx, a)); ann_to_type(cx, a));
} }
fn expr_has_ty_params(&ty_ctxt tcx, &@ast::expr expr) -> bool { fn expr_has_ty_params(&ctxt cx, &@ast::expr expr) -> bool {
ret ann_has_type_params(tcx, expr_ann(expr)); ret ann_has_type_params(cx, expr_ann(expr));
} }
fn decl_local_ty(&ctxt cx, &@ast::decl d) -> t { fn decl_local_ty(&ctxt cx, &@ast::decl d) -> t {
@ -2886,19 +2886,19 @@ fn lookup_item_type(ctxt cx, ast::def_id did) -> ty_param_count_and_ty {
} }
} }
fn ret_ty_of_fn_ty(ty_ctxt tcx, t a_ty) -> t { fn ret_ty_of_fn_ty(ctxt cx, t a_ty) -> t {
alt (ty::struct(tcx, a_ty)) { alt (ty::struct(cx, a_ty)) {
case (ty::ty_fn(_, _, ?ret_ty, _)) { case (ty::ty_fn(_, _, ?ret_ty, _)) {
ret ret_ty; ret ret_ty;
} }
case (_) { case (_) {
tcx.sess.bug("ret_ty_of_fn_ty() called on non-function type"); cx.sess.bug("ret_ty_of_fn_ty() called on non-function type");
} }
} }
} }
fn ret_ty_of_fn(ty_ctxt tcx, ast::ann ann) -> t { fn ret_ty_of_fn(ctxt cx, ast::ann ann) -> t {
ret ret_ty_of_fn_ty(tcx, ann_to_type(tcx, ann)); ret ret_ty_of_fn_ty(cx, ann_to_type(cx, ann));
} }
// Local Variables: // Local Variables: