From e584ea9876b53304880733ca3928dbad334c0c0d Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Mon, 26 Sep 2016 14:12:01 +0800
Subject: Parse - Handle attributes directly on items (for :item capture)

---
 src/macro_rules/mod.cpp |  2 ++
 src/parse/root.cpp      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'src')

diff --git a/src/macro_rules/mod.cpp b/src/macro_rules/mod.cpp
index 3d1f04c5..effa03cb 100644
--- a/src/macro_rules/mod.cpp
+++ b/src/macro_rules/mod.cpp
@@ -111,6 +111,8 @@ bool is_token_stmt(eTokenType tt) {
 bool is_token_item(eTokenType tt) {
     switch( tt )
     {
+    case TOK_ATTR_OPEN:
+    
     case TOK_RWORD_PUB:
     case TOK_RWORD_UNSAFE:
     case TOK_RWORD_TYPE:
diff --git a/src/parse/root.cpp b/src/parse/root.cpp
index 43c89a36..14a3d3ef 100644
--- a/src/parse/root.cpp
+++ b/src/parse/root.cpp
@@ -26,6 +26,9 @@ Spanned<T> get_spanned(TokenStream& lex, ::std::function<T()> f) {
 }
 #define GET_SPANNED(type, lex, val) get_spanned< type >(lex, [&](){ return val; })
 
+// Check the next two tokens
+#define LOOKAHEAD2(lex, tok1, tok2) ((lex).lookahead(0) == (tok1) && (lex).lookahead(1) == (tok2))
+
 ::std::string dirname(::std::string input) {
     while( input.size() > 0 && input.back() != '/' ) {
         input.pop_back();
@@ -1289,6 +1292,14 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::UseStmt, ::std::strin
         return tok.take_frag_item();
     }
     
+    while( LOOK_AHEAD(lex) == TOK_ATTR_OPEN /* || LOOKAHEAD2(lex, TOK_HASH, TOK_SQUARE_OPEN) */ )
+    {
+        // Attributes!
+        GET_CHECK_TOK(tok, lex, TOK_ATTR_OPEN);
+        meta_items.push_back( Parse_MetaItem(lex) );
+        GET_CHECK_TOK(tok, lex, TOK_SQUARE_CLOSE);
+    }
+    
     auto ps = lex.start_span();
     
     ::std::string   item_name;
@@ -1338,6 +1349,8 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::UseStmt, ::std::strin
                 item_data = ::AST::Item( Parse_FunctionDefWithCode(lex, abi, meta_items, false) );
                 break; }
             // NOTE: Extern blocks aren't items, and get handled in the caller.
+            case TOK_BRACE_OPEN:
+                TODO(lex.getPosition(), "Parse `extern \"abi\" {` as an item");
             default:
                 throw ParseError::Unexpected(lex, tok, {TOK_RWORD_FN, TOK_BRACE_OPEN});
             }
@@ -1348,7 +1361,10 @@ void Parse_Use(TokenStream& lex, ::std::function<void(AST::UseStmt, ::std::strin
             item_name = tok.str();
             item_data = ::AST::Item( Parse_FunctionDefWithCode(lex, "C", meta_items, false) );
             break;
+        
         // NOTE: `extern { ...` is handled in caller
+        case TOK_BRACE_OPEN:
+            TODO(lex.getPosition(), "Parse `extern {` as an item");
         
         // `extern crate "crate-name" as crate_name;`
         // `extern crate crate_name;`
-- 
cgit v1.2.3