---

yaml
---
r: 3141
b: refs/heads/master
c: 6c2f322
h: refs/heads/master
i:
  3139: 470565e
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67360ae61808453d308496f90e0b3faa3e8efee3
+refs/heads/master: 6c2f322f827ca2f2109bceab0b9630e624ac8810

trunk/src/comp/front/parser.rs

@@ -1451,7 +1451,19 @@ fn parse_source_stmt(&parser p) -> @ast::stmt {
             }
         }
 
-        alt (parse_item(p, item_attrs)) {
+        auto maybe_item = parse_item(p, item_attrs);
+
+        // If we have attributes then we should have an item
+        if (vec::len(item_attrs) > 0u) {
+            alt (maybe_item) {
+                case (got_item(_)) { /* fallthrough */ }
+                case (_) {
+                    ret p.err("expected item");
+                }
+            }
+        }
+
+        alt (maybe_item) {
             case (got_item(?i)) {
                 auto hi = i.span.hi;
                 auto decl = @spanned(lo, hi, ast::decl_item(i));

trunk/src/test/compile-fail/attr-before-stmt.rs

@@ -0,0 +1,10 @@
+// xfail-stage0
+// error-pattern:expected item
+
+fn f() {
+  #[foo = "bar"]
+  auto x = 10;
+}
+
+fn main() {
+}

trunk/src/test/compile-fail/attr-before-view-item.rs

@@ -0,0 +1,8 @@
+// xfail-stage0
+// error-pattern:expected item
+
+#[foo = "bar"]
+use std;
+
+fn main() {
+}

trunk/src/test/compile-fail/attr-dangling-in-fn.rs

@@ -0,0 +1,9 @@
+// xfail-stage0
+// error-pattern:expected item
+
+fn f() {
+  #[foo = "bar"]
+}
+
+fn main() {
+}

trunk/src/test/compile-fail/attr-dangling-in-mod.rs

@@ -0,0 +1,7 @@
+// xfail-stage0
+// error-pattern:expected item
+
+fn main() {
+}
+
+#[foo = "bar"]