tt-attrs

2 files changed, 7 insertions, 56 deletions

diff --git a/crates/libsyntax2/src/grammar/attributes.rs b/crates/libsyntax2/src/grammar/attributes.rs
index c411d4d7f..cd30e8a45 100644
--- a/crates/libsyntax2/src/grammar/attributes.rs
+++ b/crates/libsyntax2/src/grammar/attributes.rs
@@ -22,58 +22,10 @@ fn attribute(p: &mut Parser, inner: bool) {
         p.bump();
     }
 
-    if p.expect(L_BRACK) {
-        meta_item(p);
-        p.expect(R_BRACK);
-    }
-    attr.complete(p, ATTR);
-}
-
-fn meta_item(p: &mut Parser) {
-    if p.at(IDENT) {
-        let meta_item = p.start();
-        p.bump();
-        match p.current() {
-            EQ => {
-                p.bump();
-                if expressions::literal(p).is_none() {
-                    p.error("expected literal");
-                }
-            }
-            L_PAREN => meta_item_arg_list(p),
-            _ => (),
-        }
-        meta_item.complete(p, META_ITEM);
+    if p.at(L_BRACK) {
+        items::token_tree(p);
     } else {
-        p.error("expected attribute value");
-    }
-}
-
-fn meta_item_arg_list(p: &mut Parser) {
-    assert!(p.at(L_PAREN));
-    p.bump();
-    loop {
-        match p.current() {
-            EOF | R_PAREN => break,
-            IDENT => meta_item(p),
-            c => if expressions::literal(p).is_none() {
-                let message = "expected attribute";
-
-                if items::ITEM_FIRST.contains(c) {
-                    p.error(message);
-                    return;
-                }
-
-                let err = p.start();
-                p.error(message);
-                p.bump();
-                err.complete(p, ERROR);
-                continue;
-            },
-        }
-        if !p.at(R_PAREN) {
-            p.expect(COMMA);
-        }
+        p.error("expected `[`");
     }
-    p.expect(R_PAREN);
+    attr.complete(p, ATTR);
 }
diff --git a/crates/libsyntax2/src/grammar/items/mod.rs b/crates/libsyntax2/src/grammar/items/mod.rs
index fc02f0c5c..84cb47748 100644
--- a/crates/libsyntax2/src/grammar/items/mod.rs
+++ b/crates/libsyntax2/src/grammar/items/mod.rs
@@ -55,9 +55,6 @@ pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool, flavor: ItemF
     }
 }
 
-pub(super) const ITEM_FIRST: TokenSet =
-    token_set![EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, ENUM_KW, FN_KW, PUB_KW, POUND];
-
 pub(super) enum MaybeItem {
     None,
     Item(SyntaxKind),
@@ -322,13 +319,14 @@ pub(super) fn macro_call_after_excl(p: &mut Parser) -> BlockLike {
     flavor
 }
 
-fn token_tree(p: &mut Parser) {
+pub(super) fn token_tree(p: &mut Parser) {
     let closing_paren_kind = match p.current() {
         L_CURLY => R_CURLY,
         L_PAREN => R_PAREN,
         L_BRACK => R_BRACK,
         _ => unreachable!(),
     };
+    let m = p.start();
     p.bump();
     while !p.at(EOF) && !p.at(closing_paren_kind) {
         match p.current() {
@@ -338,4 +336,5 @@ fn token_tree(p: &mut Parser) {
         }
     };
     p.expect(closing_paren_kind);
+    m.complete(p, TOKEN_TREE);
 }