diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/parser/event_parser/grammar/items/mod.rs | 18 | ||||
-rw-r--r-- | src/parser/event_parser/grammar/items/traits.rs | 17 | ||||
-rw-r--r-- | src/syntax_kinds.rs | 4 |
3 files changed, 39 insertions, 0 deletions
diff --git a/src/parser/event_parser/grammar/items/mod.rs b/src/parser/event_parser/grammar/items/mod.rs index 6d6fabbd7..3612802e1 100644 --- a/src/parser/event_parser/grammar/items/mod.rs +++ b/src/parser/event_parser/grammar/items/mod.rs | |||
@@ -3,6 +3,7 @@ use super::*; | |||
3 | mod structs; | 3 | mod structs; |
4 | mod use_item; | 4 | mod use_item; |
5 | mod consts; | 5 | mod consts; |
6 | mod traits; | ||
6 | 7 | ||
7 | pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { | 8 | pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { |
8 | attributes::inner_attributes(p); | 9 | attributes::inner_attributes(p); |
@@ -80,6 +81,22 @@ fn item(p: &mut Parser) { | |||
80 | CONST_ITEM | 81 | CONST_ITEM |
81 | } | 82 | } |
82 | }, | 83 | }, |
84 | // TODO: auto trait | ||
85 | // test unsafe_trait | ||
86 | // unsafe trait T {} | ||
87 | UNSAFE_KW if la == TRAIT_KW => { | ||
88 | p.bump(); | ||
89 | traits::trait_item(p); | ||
90 | TRAIT_ITEM | ||
91 | } | ||
92 | // TODO: default impl | ||
93 | // test unsafe_impl | ||
94 | // unsafe impl Foo {} | ||
95 | UNSAFE_KW if la == IMPL_KW => { | ||
96 | p.bump(); | ||
97 | traits::impl_item(p); | ||
98 | IMPL_ITEM | ||
99 | } | ||
83 | MOD_KW => { | 100 | MOD_KW => { |
84 | mod_item(p); | 101 | mod_item(p); |
85 | MOD_ITEM | 102 | MOD_ITEM |
@@ -131,6 +148,7 @@ fn extern_block(p: &mut Parser) { | |||
131 | p.bump(); | 148 | p.bump(); |
132 | p.expect(R_CURLY); | 149 | p.expect(R_CURLY); |
133 | } | 150 | } |
151 | |||
134 | fn mod_item(p: &mut Parser) { | 152 | fn mod_item(p: &mut Parser) { |
135 | assert!(p.at(MOD_KW)); | 153 | assert!(p.at(MOD_KW)); |
136 | p.bump(); | 154 | p.bump(); |
diff --git a/src/parser/event_parser/grammar/items/traits.rs b/src/parser/event_parser/grammar/items/traits.rs new file mode 100644 index 000000000..3bef9639f --- /dev/null +++ b/src/parser/event_parser/grammar/items/traits.rs | |||
@@ -0,0 +1,17 @@ | |||
1 | use super::*; | ||
2 | |||
3 | pub(super) fn trait_item(p: &mut Parser) { | ||
4 | assert!(p.at(TRAIT_KW)); | ||
5 | p.bump(); | ||
6 | p.expect(IDENT); | ||
7 | p.expect(L_CURLY); | ||
8 | p.expect(R_CURLY); | ||
9 | } | ||
10 | |||
11 | pub(super) fn impl_item(p: &mut Parser) { | ||
12 | assert!(p.at(IMPL_KW)); | ||
13 | p.bump(); | ||
14 | p.expect(IDENT); | ||
15 | p.expect(L_CURLY); | ||
16 | p.expect(R_CURLY); | ||
17 | } | ||
diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs index c182aea78..22c615831 100644 --- a/src/syntax_kinds.rs +++ b/src/syntax_kinds.rs | |||
@@ -92,6 +92,8 @@ pub enum SyntaxKind { | |||
92 | USE_ITEM, | 92 | USE_ITEM, |
93 | STATIC_ITEM, | 93 | STATIC_ITEM, |
94 | CONST_ITEM, | 94 | CONST_ITEM, |
95 | TRAIT_ITEM, | ||
96 | IMPL_ITEM, | ||
95 | EXTERN_BLOCK, | 97 | EXTERN_BLOCK, |
96 | ENUM_VARIANT, | 98 | ENUM_VARIANT, |
97 | NAMED_FIELD, | 99 | NAMED_FIELD, |
@@ -207,6 +209,8 @@ impl SyntaxKind { | |||
207 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, | 209 | USE_ITEM => &SyntaxInfo { name: "USE_ITEM" }, |
208 | STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" }, | 210 | STATIC_ITEM => &SyntaxInfo { name: "STATIC_ITEM" }, |
209 | CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" }, | 211 | CONST_ITEM => &SyntaxInfo { name: "CONST_ITEM" }, |
212 | TRAIT_ITEM => &SyntaxInfo { name: "TRAIT_ITEM" }, | ||
213 | IMPL_ITEM => &SyntaxInfo { name: "IMPL_ITEM" }, | ||
210 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, | 214 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, |
211 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, | 215 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, |
212 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, | 216 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, |