G: start attributes

4 files changed, 35 insertions, 9 deletions

diff --git a/src/lexer/mod.rs b/src/lexer/mod.rs
index bc5344b5f..842059a42 100644
--- a/src/lexer/mod.rs
+++ b/src/lexer/mod.rs
@@ -129,7 +129,7 @@ fn next_token_inner(c: char, ptr: &mut Ptr) -> SyntaxKind {
                 ptr.bump();
                 NEQ
             }
-            _ => NOT,
+            _ => EXCL,
         },
         '-' => return if ptr.next_is('>') {
             ptr.bump();
diff --git a/src/parser/event_parser/grammar.rs b/src/parser/event_parser/grammar.rs
index 09b2f02b2..d657ee1cd 100644
--- a/src/parser/event_parser/grammar.rs
+++ b/src/parser/event_parser/grammar.rs
@@ -17,10 +17,6 @@ pub fn file(p: &mut Parser) {
     })
 }
 
-fn inner_attributes(_: &mut Parser) {
-    //TODO
-}
-
 fn item_first(p: &Parser) -> bool {
     let current = match p.current() {
         Some(c) => c,
@@ -58,6 +54,20 @@ fn fn_item(p: &mut Parser) {
 
 // Paths, types, attributes, and stuff //
 
+fn inner_attributes(p: &mut Parser) {
+    many(p, inner_attribute)
+}
+
+fn inner_attribute(p: &mut Parser) -> bool {
+    if !(p.lookahead(&[EXCL, POUND])) {
+        return false;
+    }
+    node(p, ATTR, |p| {
+        p.bump_n(2);
+    });
+    true
+}
+
 fn outer_attributes(_: &mut Parser) {
 }
 
@@ -143,9 +153,15 @@ impl<'p> Parser<'p> {
         }
     }
 
-    pub(crate) fn optional(&mut self, kind: SyntaxKind) {
+    fn optional(&mut self, kind: SyntaxKind) {
         if self.current_is(kind) {
             self.bump();
         }
     }
+
+    fn bump_n(&mut self, n: u8) {
+        for _ in 0..n {
+            self.bump();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/parser/event_parser/parser.rs b/src/parser/event_parser/parser.rs
index eafa03521..f8330af4e 100644
--- a/src/parser/event_parser/parser.rs
+++ b/src/parser/event_parser/parser.rs
@@ -86,6 +86,14 @@ impl<'t> Parser<'t> {
         Some(kind)
     }
 
+    pub(crate) fn lookahead(&self, kinds: &[SyntaxKind]) -> bool {
+        if self.non_ws_tokens[self.pos..].len() < kinds.len() {
+            return false
+        }
+        kinds.iter().zip(self.non_ws_tokens[self.pos..].iter())
+            .all(|(&k1, &(idx, _))| k1 == self.raw_tokens[idx].kind)
+    }
+
     pub(crate) fn curly_block<F: FnOnce(&mut Parser)>(&mut self, f: F) -> bool {
         let old_level = self.curly_level;
         let old_limit = self.curly_limit;
diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs
index 6099cd6e0..67c840a3e 100644
--- a/src/syntax_kinds.rs
+++ b/src/syntax_kinds.rs
@@ -38,7 +38,7 @@ pub const EQ: SyntaxKind = SyntaxKind(33);
 pub const EQEQ: SyntaxKind = SyntaxKind(34);
 pub const FAT_ARROW: SyntaxKind = SyntaxKind(35);
 pub const NEQ: SyntaxKind = SyntaxKind(36);
-pub const NOT: SyntaxKind = SyntaxKind(37);
+pub const EXCL: SyntaxKind = SyntaxKind(37);
 pub const LIFETIME: SyntaxKind = SyntaxKind(38);
 pub const CHAR: SyntaxKind = SyntaxKind(39);
 pub const BYTE: SyntaxKind = SyntaxKind(40);
@@ -62,8 +62,9 @@ pub const FILE: SyntaxKind = SyntaxKind(57);
 pub const STRUCT_ITEM: SyntaxKind = SyntaxKind(58);
 pub const STRUCT_FIELD: SyntaxKind = SyntaxKind(59);
 pub const FN_ITEM: SyntaxKind = SyntaxKind(60);
+pub const ATTR: SyntaxKind = SyntaxKind(61);
 
-static INFOS: [SyntaxInfo; 61] = [
+static INFOS: [SyntaxInfo; 62] = [
     SyntaxInfo { name: "USE_KW" },
     SyntaxInfo { name: "FN_KW" },
     SyntaxInfo { name: "STRUCT_KW" },
@@ -101,7 +102,7 @@ static INFOS: [SyntaxInfo; 61] = [
     SyntaxInfo { name: "EQEQ" },
     SyntaxInfo { name: "FAT_ARROW" },
     SyntaxInfo { name: "NEQ" },
-    SyntaxInfo { name: "NOT" },
+    SyntaxInfo { name: "EXCL" },
     SyntaxInfo { name: "LIFETIME" },
     SyntaxInfo { name: "CHAR" },
     SyntaxInfo { name: "BYTE" },
@@ -125,6 +126,7 @@ static INFOS: [SyntaxInfo; 61] = [
     SyntaxInfo { name: "STRUCT_ITEM" },
     SyntaxInfo { name: "STRUCT_FIELD" },
     SyntaxInfo { name: "FN_ITEM" },
+    SyntaxInfo { name: "ATTR" },
 ];
 
 pub(crate) fn syntax_info(kind: SyntaxKind) -> &'static SyntaxInfo {