---

yaml
---
r: 1191
b: refs/heads/master
c: 7c8f99f
h: refs/heads/master
i:
  1189: 8962581
  1187: 126abfc
  1183: c7a02b8
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29fb238a39e94b3fad05cc1ab0a015930ce784e5
+refs/heads/master: 7c8f99fdc1be0ed80095af160fffae2995cda83f

trunk/src/comp/front/ast.rs

@@ -36,6 +36,7 @@ tag def {
     def_ty_arg(def_id);
     def_binding(def_id);
     def_use(def_id);
+    def_import(def_id);
 }
 
 type crate = spanned[crate_];
@@ -213,7 +214,7 @@ type _obj = rec(vec[obj_field] fields,
 
 
 tag mod_index_entry {
-    mie_use(uint);
+    mie_view_item(uint);
     mie_item(uint);
     mie_tag_variant(uint /* tag item index */, uint /* variant index */);
 }

trunk/src/comp/front/parser.rs

@@ -1,4 +1,5 @@
 import std._io;
+import std._vec;
 import std.option;
 import std.option.some;
 import std.option.none;
@@ -1751,10 +1752,12 @@ impure fn parse_view(parser p, ast.mod_index index) -> vec[@ast.view_item] {
         items += vec(item);
         alt (item.node) {
             case(ast.view_item_use(?id, _, _)) {
-                index.insert(id, ast.mie_use(u));
+                index.insert(id, ast.mie_view_item(u));
             }
             case(ast.view_item_import(?ids,_)) {
-                // FIXME
+                auto len = _vec.len[ast.ident](ids);
+                auto last_id = ids.(len - 1u);
+                index.insert(last_id, ast.mie_view_item(u));
             }
         }
         u = u + 1u;

trunk/src/comp/middle/resolve.rs

@@ -73,7 +73,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] {
                 ret some[def](ast.def_use(id));
             }
             case (ast.view_item_import(_,?id)) {
-                fail;
+                ret some[def](ast.def_import(id));
             }
         }
     }
@@ -82,7 +82,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] {
         alt (m.index.find(i)) {
             case (some[ast.mod_index_entry](?ent)) {
                 alt (ent) {
-                    case (ast.mie_use(?ix)) {
+                    case (ast.mie_view_item(?ix)) {
                         ret found_def_view(m.view_items.(ix));
                     }
                     case (ast.mie_item(?ix)) {

trunk/src/comp/middle/ty.rs

@@ -543,44 +543,6 @@ fn is_fn_ty(@t fty) -> bool {
 
 // Type accessors for AST nodes
 
-// Given an item, returns the associated type as well as a list of the IDs of
-// its type parameters.
-fn item_ty(@ast.item it) -> tup(vec[ast.def_id], @t) {
-    let vec[ast.ty_param] ty_params;
-    auto result_ty;
-    alt (it.node) {
-        case (ast.item_const(_, _, _, _, ?ann)) {
-            ty_params = vec();
-            result_ty = ann_to_type(ann);
-        }
-        case (ast.item_fn(_, _, ?tps, _, ?ann)) {
-            ty_params = tps;
-            result_ty = ann_to_type(ann);
-        }
-        case (ast.item_mod(_, _, _)) {
-            fail;   // modules are typeless
-        }
-        case (ast.item_ty(_, _, ?tps, _, ?ann)) {
-            ty_params = tps;
-            result_ty = ann_to_type(ann);
-        }
-        case (ast.item_tag(_, _, ?tps, ?did)) {
-            ty_params = tps;
-            result_ty = plain_ty(ty_tag(did));
-        }
-        case (ast.item_obj(_, _, ?tps, _, ?ann)) {
-            ty_params = tps;
-            result_ty = ann_to_type(ann);
-        }
-    }
-
-    let vec[ast.def_id] ty_param_ids = vec();
-    for (ast.ty_param tp in ty_params) {
-        ty_param_ids += vec(tp.id);
-    }
-    ret tup(ty_param_ids, result_ty);
-}
-
 fn stmt_ty(@ast.stmt s) -> @t {
     alt (s.node) {
         case (ast.stmt_expr(?e)) {