---

yaml
---
r: 3101
b: refs/heads/master
c: 11c5c73
h: refs/heads/master
i:
  3099: 435cad9
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eefa5f9d37253e00bd373b7c45857fd9c4e2836
+refs/heads/master: 11c5c73d56406b1471b8f989eaa49a6c30aff7ad

trunk/src/comp/front/ast.rs

@@ -448,11 +448,26 @@ tag view_item_ {
 
 type obj_def_ids = rec(def_id ty, def_id ctor);
 
+
+// Meta-data associated with an item
+type attribute = spanned[attribute_];
+
+// Distinguishes between attributes that decorate items and attributes that
+// are contained as statements within items. These two cases need to be
+// distinguished for pretty-printing.
+tag attr_style {
+    attr_outer;
+    attr_inner;
+}
+
+type attribute_ = rec(attr_style style,
+                      meta_item value);
+
 type item = spanned[item_];
 tag item_ {
     item_const(ident, @ty, @expr, def_id, ann);
     item_fn(ident, _fn, vec[ty_param], def_id, ann);
-    item_mod(ident, _mod, vec[meta_item], def_id);
+    item_mod(ident, _mod, vec[attribute], def_id);
     item_native_mod(ident, native_mod, def_id);
     item_ty(ident, @ty, vec[ty_param], def_id, ann);
     item_tag(ident, vec[variant], vec[ty_param], def_id, ann);

trunk/src/comp/front/parser.rs

@@ -1912,7 +1912,7 @@ fn parse_item_const(&parser p) -> @ast::item {
     ret @spanned(lo, hi, item);
 }
 
-fn parse_item_mod(&parser p, vec[ast::meta_item] attrs) -> @ast::item {
+fn parse_item_mod(&parser p, vec[ast::attribute] attrs) -> @ast::item {
     auto lo = p.get_last_lo_pos();
     auto id = parse_ident(p);
     expect(p, token::LBRACE);
@@ -2125,7 +2125,7 @@ tag parsed_item {
     fn_no_item;
 }
 
-fn parse_item(&parser p, vec[ast::meta_item] attrs) -> parsed_item {
+fn parse_item(&parser p, vec[ast::attribute] attrs) -> parsed_item {
 
     if (eat_word(p, "const")) {
         ret got_item(parse_item_const(p));
@@ -2156,19 +2156,27 @@ fn parse_item(&parser p, vec[ast::meta_item] attrs) -> parsed_item {
     }
 }
 
-fn parse_attributes(&parser p) -> vec[ast::meta_item] {
-    let vec[ast::meta_item] attrs = [];
+fn parse_attributes(&parser p) -> vec[ast::attribute] {
+    let vec[ast::attribute] attrs = [];
 
     while (p.peek() == token::POUND) {
-        p.bump();
-        expect(p, token::LBRACKET);
-        attrs += [*parse_meta_item(p)];
-        expect(p, token::RBRACKET);
+        attrs += [parse_attribute(p)];
     }
 
     ret attrs;
 }
 
+fn parse_attribute(&parser p) -> ast::attribute {
+    auto lo = p.get_lo_pos();
+    expect(p, token::POUND);
+    expect(p, token::LBRACKET);
+    auto meta_item = parse_meta_item(p);
+    expect(p, token::RBRACKET);
+    auto hi = p.get_hi_pos();
+    ret spanned(lo, hi, rec(style = ast::attr_outer,
+                            value = *meta_item));
+}
+
 fn parse_meta_item(&parser p) -> @ast::meta_item {
     auto lo = p.get_lo_pos();
     auto ident = parse_ident(p);