---

yaml
---
r: 1187
b: refs/heads/master
c: 35c745d
h: refs/heads/master
i:
  1185: 9d71a39
  1183: 7a4f557
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfb97b3393b5a6a43d81c5edbb8d7867ac1d7bf0
+refs/heads/master: 35c745da03078c9bc58e6f6f2cf57c84e354f09d

trunk/src/comp/front/ast.rs

@@ -46,9 +46,9 @@ type use_node_ = rec(ident name, vec[@meta_item] metadata);
 type import_node = spanned[import_node_];
 type import_node_ = rec(vec[ident] identifiers);
 
-tag use_or_import {
-    use_or_import_use(@use_node);
-    use_or_import_import(@import_node);
+tag view_item {
+    view_item_use(@use_node);
+    view_item_import(@import_node);
 }
 
 type meta_item = spanned[meta_item_];

trunk/src/comp/front/parser.rs

@@ -1405,7 +1405,7 @@ impure fn parse_item_obj(parser p, ast.layer lyr) -> @ast.item {
 }
 
 impure fn parse_mod_items(parser p, token.token term) -> ast._mod {
-    parse_use_and_imports(p);
+    parse_view(p);
 
     let vec[@ast.item] items = vec();
     auto index = new_str_hash[ast.mod_index_entry]();
@@ -1721,15 +1721,15 @@ impure fn parse_import(parser p) -> @ast.import_node {
     fail;
 }
 
-impure fn parse_use_and_imports(parser p) -> vec[ast.use_or_import] {
-    let vec[ast.use_or_import] items = vec();
+impure fn parse_view(parser p) -> vec[ast.view_item] {
+    let vec[ast.view_item] items = vec();
     while (true) {
         alt (p.peek()) {
             case (token.USE) {
-                items += vec(ast.use_or_import_use(parse_use(p)));
+                items += vec(ast.view_item_use(parse_use(p)));
             }
             case (token.IMPORT) {
-                items += vec(ast.use_or_import_import(parse_import(p)));
+                items += vec(ast.view_item_import(parse_import(p)));
             }
             case (_) {
                 ret items;