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

Fix bug in typechecker counting occurrences of typarams in instantiation rather than checking formals list.

Browse Source
This commit is contained in:
Graydon Hoare 2011-07-29 18:44:47 -07:00
parent 0c9b749d20
commit bc4e9afe25
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/comp/middle/typeck.rs
View File

@ -287,9 +287,9 @@ fn ast_ty_to_ty(tcx: &ty::ctxt, getter: &ty_getter, ast_ty: &@ast::ty) ->
// TODO: maybe record cname chains so we can do
// "foo = int" like OCaml?
let params_opt_and_ty = getter(id);
if ivec::len(params_opt_and_ty.kinds) == 0u {
ret params_opt_and_ty.ty;
let ty_param_kinds_and_ty = getter(id);
if ivec::len(ty_param_kinds_and_ty.kinds) == 0u {
ret ty_param_kinds_and_ty.ty;
}
// The typedef is type-parametric. Do the type substitution.
//
@ -299,14 +299,14 @@ fn ast_ty_to_ty(tcx: &ty::ctxt, getter: &ty_getter, ast_ty: &@ast::ty) ->
param_bindings += ~[ast_ty_to_ty(tcx, getter, ast_ty)];
}
if ivec::len(param_bindings) !=
ty::count_ty_params(tcx, params_opt_and_ty.ty) {
ivec::len(ty_param_kinds_and_ty.kinds) {
tcx.sess.span_fatal(sp,
"Wrong number of type arguments for a \
polymorphic tag");
polymorphic type");
}
let typ =
ty::substitute_type_params(tcx, param_bindings,
params_opt_and_ty.ty);
ty_param_kinds_and_ty.ty);
ret typ;
}
let typ;