Skip to content

Commit cd11ec9

Browse files
cixtorcixtor
committed
---
yaml --- r: 1311 b: refs/heads/master c: 3cac20d h: refs/heads/master i: 1309: f358539 1307: 0295240 1303: 170fbe5 1295: b5cec48 1279: 6706a1b v: v3
1 parent cb35951 commit cd11ec9

File tree

7 files changed

+55
-29
lines changed

7 files changed

+55
-29
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 13b7a356f8ec1542a4f84009e2f1fcd278bafd54
2+
refs/heads/master: 3cac20dae3272728282466467cb0193d7dbbf00c

‎trunk/src/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
466466
import5.rs \
467467
import6.rs \
468468
import7.rs \
469+
import8.rs \
469470
item-name-overload.rs \
470471
large-records.rs \
471472
lazy-init.rs \

‎trunk/src/comp/front/ast.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ type variant = rec(str name, vec[variant_arg] args, def_id id, ann ann);
231231
type view_item = spanned[view_item_];
232232
tag view_item_ {
233233
view_item_use(ident, vec[@meta_item], def_id);
234-
view_item_import(vec[ident], def_id, option.t[def]);
234+
view_item_import(ident, vec[ident], def_id, option.t[def]);
235235
}
236236

237237
type item = spanned[item_];
@@ -249,10 +249,8 @@ fn index_view_item(mod_index index, @view_item it) {
249249
case(ast.view_item_use(?id, _, _)) {
250250
index.insert(id, ast.mie_view_item(it));
251251
}
252-
case(ast.view_item_import(?ids,_,_)) {
253-
auto len = _vec.len[ast.ident](ids);
254-
auto last_id = ids.(len - 1u);
255-
index.insert(last_id, ast.mie_view_item(it));
252+
case(ast.view_item_import(?def_ident,_,_,_)) {
253+
index.insert(def_ident, ast.mie_view_item(it));
256254
}
257255
}
258256
}

‎trunk/src/comp/front/parser.rs

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,27 +1756,41 @@ impure fn parse_use(parser p) -> @ast.view_item {
17561756
ret @spanned(lo, hi, use_decl);
17571757
}
17581758

1759-
impure fn parse_rest_import_name(parser p, ast.ident id) -> @ast.view_item {
1759+
impure fn parse_rest_import_name(parser p, ast.ident first,
1760+
option.t[ast.ident] def_ident)
1761+
-> @ast.view_item {
17601762
auto lo = p.get_span();
17611763
auto hi = lo;
17621764
let vec[ast.ident] identifiers = vec();
1763-
identifiers += id;
1765+
identifiers += first;
17641766
while (p.peek() != token.SEMI) {
17651767
expect(p, token.DOT);
17661768
auto i = parse_ident(p);
17671769
identifiers += i;
17681770
}
17691771
p.bump();
1770-
auto import_decl = ast.view_item_import(identifiers, p.next_def_id(),
1772+
auto defined_id;
1773+
alt (def_ident) {
1774+
case(some[ast.ident](?i)) {
1775+
defined_id = i;
1776+
}
1777+
case (_) {
1778+
auto len = _vec.len[ast.ident](identifiers);
1779+
defined_id = identifiers.(len - 1u);
1780+
}
1781+
}
1782+
auto import_decl = ast.view_item_import(defined_id, identifiers,
1783+
p.next_def_id(),
17711784
none[ast.def]);
17721785
ret @spanned(lo, hi, import_decl);
17731786
}
17741787

1775-
impure fn parse_full_import_name(parser p) -> @ast.view_item {
1788+
impure fn parse_full_import_name(parser p, ast.ident def_ident)
1789+
-> @ast.view_item {
17761790
alt (p.peek()) {
17771791
case (token.IDENT(?ident)) {
17781792
p.bump();
1779-
ret parse_rest_import_name(p, ident);
1793+
ret parse_rest_import_name(p, ident, some(def_ident));
17801794
}
17811795
case (_) {
17821796
p.err("expecting an identifier");
@@ -1793,10 +1807,10 @@ impure fn parse_import(parser p) -> @ast.view_item {
17931807
alt (p.peek()) {
17941808
case (token.EQ) {
17951809
p.bump();
1796-
ret parse_full_import_name(p);
1810+
ret parse_full_import_name(p, ident);
17971811
}
17981812
case (_) {
1799-
ret parse_rest_import_name(p, ident);
1813+
ret parse_rest_import_name(p, ident, none[ast.ident]);
18001814
}
18011815
}
18021816
}

‎trunk/src/comp/middle/fold.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ type ast_fold[ENV] =
213213
vec[@meta_item] meta_items,
214214
def_id id) -> @view_item) fold_view_item_use,
215215

216-
(fn(&ENV e, &span sp, vec[ident] idents,
216+
(fn(&ENV e, &span sp, ident i, vec[ident] idents,
217217
def_id id, option.t[def]) -> @view_item) fold_view_item_import,
218218

219219
// Additional nodes.
@@ -725,14 +725,13 @@ fn fold_view_item[ENV](&ENV env, ast_fold[ENV] fld, @view_item vi)
725725

726726
alt (vi.node) {
727727
case (ast.view_item_use(?ident, ?meta_items, ?def_id)) {
728-
// FIXME: what other folding should be done in here?
729728
ret fld.fold_view_item_use(env_, vi.span, ident, meta_items,
730729
def_id);
731730
}
732-
case (ast.view_item_import(?idents, ?def_id, ?target_def)) {
733-
// FIXME: what other folding should be done in here?
734-
ret fld.fold_view_item_import(env_, vi.span, idents, def_id,
735-
target_def);
731+
case (ast.view_item_import(?def_ident, ?idents, ?def_id,
732+
?target_def)) {
733+
ret fld.fold_view_item_import(env_, vi.span, def_ident, idents,
734+
def_id, target_def);
736735
}
737736
}
738737

@@ -1116,10 +1115,11 @@ fn identity_fold_view_item_use[ENV](&ENV e, &span sp, ident i,
11161115
ret @respan(sp, ast.view_item_use(i, meta_items, id));
11171116
}
11181117

1119-
fn identity_fold_view_item_import[ENV](&ENV e, &span sp, vec[ident] is,
1120-
def_id id, option.t[def] target_def)
1118+
fn identity_fold_view_item_import[ENV](&ENV e, &span sp, ident i,
1119+
vec[ident] is, def_id id,
1120+
option.t[def] target_def)
11211121
-> @view_item {
1122-
ret @respan(sp, ast.view_item_import(is, id, target_def));
1122+
ret @respan(sp, ast.view_item_import(i, is, id, target_def));
11231123
}
11241124

11251125
// Additional identities.
@@ -1271,7 +1271,7 @@ fn new_identity_fold[ENV]() -> ast_fold[ENV] {
12711271
fold_view_item_use =
12721272
bind identity_fold_view_item_use[ENV](_,_,_,_,_),
12731273
fold_view_item_import =
1274-
bind identity_fold_view_item_import[ENV](_,_,_,_,_),
1274+
bind identity_fold_view_item_import[ENV](_,_,_,_,_,_),
12751275

12761276
fold_block = bind identity_fold_block[ENV](_,_,_),
12771277
fold_fn = bind identity_fold_fn[ENV](_,_,_,_,_,_),

‎trunk/src/comp/middle/resolve.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn unwrap_def(def_wrap d) -> def {
5050
}
5151
case (def_wrap_import(?it)) {
5252
alt (it.node) {
53-
case (ast.view_item_import(_, ?id, ?target_def)) {
53+
case (ast.view_item_import(_, _, ?id, ?target_def)) {
5454
alt (target_def) {
5555
case (some[def](?d)) {
5656
ret d;
@@ -106,7 +106,7 @@ fn find_final_def(&env e, import_map index,
106106
alt (d) {
107107
case (def_wrap_import(?imp)) {
108108
alt (imp.node) {
109-
case (ast.view_item_import(?new_idents, ?d, _)) {
109+
case (ast.view_item_import(_, ?new_idents, ?d, _)) {
110110
auto x = find_final_def(e, index, sp, new_idents,
111111
some(d));
112112
ret found_something(e, index, sp, idents, x);
@@ -235,7 +235,7 @@ fn lookup_name_wrapped(&env e, ast.ident i) -> option.t[tup(@env, def_wrap)] {
235235
case (ast.view_item_use(_, _, ?id)) {
236236
ret def_wrap_use(i);
237237
}
238-
case (ast.view_item_import(?idents,?d, _)) {
238+
case (ast.view_item_import(_, ?idents,?d, _)) {
239239
ret def_wrap_import(i);
240240
}
241241
}
@@ -456,7 +456,7 @@ fn fold_expr_path(&env e, &span sp, &ast.path p, &option.t[def] d,
456456
}
457457

458458
fn fold_view_item_import(&env e, &span sp,
459-
import_map index,
459+
import_map index, ident i,
460460
vec[ident] is, ast.def_id id,
461461
option.t[def] target_id) -> @ast.view_item {
462462
// Produce errors for invalid imports
@@ -472,7 +472,7 @@ fn fold_view_item_import(&env e, &span sp,
472472
}
473473
}
474474
let option.t[def] target_def = some(unwrap_def(d));
475-
ret @fold.respan[ast.view_item_](sp, ast.view_item_import(is, id,
475+
ret @fold.respan[ast.view_item_](sp, ast.view_item_import(i, is, id,
476476
target_def));
477477
}
478478

@@ -514,7 +514,7 @@ fn resolve_imports(session.session sess, @ast.crate crate) -> @ast.crate {
514514

515515
auto import_index = new_def_hash[def_wrap]();
516516
fld = @rec( fold_view_item_import
517-
= bind fold_view_item_import(_,_,import_index,_,_,_),
517+
= bind fold_view_item_import(_,_,import_index,_,_,_,_),
518518
update_env_for_crate = bind update_env_for_crate(_,_),
519519
update_env_for_item = bind update_env_for_item(_,_),
520520
update_env_for_block = bind update_env_for_block(_,_),

‎trunk/src/test/run-pass/import8.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import foo.x;
2+
import z = foo.x;
3+
4+
mod foo {
5+
fn x(int y) {
6+
log y;
7+
}
8+
}
9+
10+
fn main() {
11+
x(10);
12+
z(10);
13+
}

0 commit comments

Comments
 (0)