user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle paths correctly. This lets us handle one more test :-)

Browse source
This commit is contained in:
Rafael Ávila de Espíndola 2011-01-27 15:50:19 -05:00
parent 5066937f10
commit 21208f2343
3 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/comp/middle/resolve.rs
View file

@ -381,21 +381,15 @@ fn fold_pat_tag(&env e, &span sp, ast.path p, vec[@ast.pat] args,
auto len = _vec.len[ast.ident](p.node.idents);
auto last_id = p.node.idents.(len - 1u);
auto new_def;
alt (lookup_name(e, last_id)) {
case (some[def](?d)) {
alt (d) {
case (ast.def_variant(?did, ?vid)) {
new_def = some[ast.variant_def](tup(did, vid));
}
case (_) {
e.sess.span_err(sp, "not a tag variant: " + last_id);
new_def = none[ast.variant_def];
}
}
auto index = new_def_hash[def_wrap]();
auto d = find_final_def(e, index, sp, p.node.idents, none[ast.def_id]);
alt (unwrap_def(d)) {
case (ast.def_variant(?did, ?vid)) {
new_def = some[ast.variant_def](tup(did, vid));
}
case (none[def]) {
case (_) {
e.sess.span_err(sp, "not a tag variant: " + last_id);
new_def = none[ast.variant_def];
e.sess.span_err(sp, "unresolved name: " + last_id);
}
}