diff options
-rw-r--r-- | src/grammar/mod.rs | 55 | ||||
-rw-r--r-- | tests/data/parser/inline/0099_crate_keyword_vis.rs | 1 | ||||
-rw-r--r-- | tests/data/parser/inline/0099_crate_keyword_vis.txt | 18 |
3 files changed, 51 insertions, 23 deletions
diff --git a/src/grammar/mod.rs b/src/grammar/mod.rs index b6da0d013..1e7d04ce9 100644 --- a/src/grammar/mod.rs +++ b/src/grammar/mod.rs | |||
@@ -55,34 +55,43 @@ impl BlockLike { | |||
55 | } | 55 | } |
56 | 56 | ||
57 | fn visibility(p: &mut Parser) { | 57 | fn visibility(p: &mut Parser) { |
58 | if p.at(PUB_KW) { | 58 | match p.current() { |
59 | let vis = p.start(); | 59 | PUB_KW => { |
60 | p.bump(); | 60 | let m = p.start(); |
61 | if p.at(L_PAREN) { | 61 | p.bump(); |
62 | match p.nth(1) { | 62 | if p.at(L_PAREN) { |
63 | // test crate_visibility | 63 | match p.nth(1) { |
64 | // pub(crate) struct S; | 64 | // test crate_visibility |
65 | // pub(self) struct S; | 65 | // pub(crate) struct S; |
66 | // pub(self) struct S; | 66 | // pub(self) struct S; |
67 | // pub(self) struct S; | 67 | // pub(self) struct S; |
68 | CRATE_KW | SELF_KW | SUPER_KW => { | 68 | // pub(self) struct S; |
69 | p.bump(); | 69 | CRATE_KW | SELF_KW | SUPER_KW => { |
70 | p.bump(); | 70 | p.bump(); |
71 | p.expect(R_PAREN); | 71 | p.bump(); |
72 | } | 72 | p.expect(R_PAREN); |
73 | IN_KW => { | 73 | } |
74 | p.bump(); | 74 | IN_KW => { |
75 | p.bump(); | 75 | p.bump(); |
76 | paths::use_path(p); | 76 | p.bump(); |
77 | p.expect(R_PAREN); | 77 | paths::use_path(p); |
78 | p.expect(R_PAREN); | ||
79 | } | ||
80 | _ => (), | ||
78 | } | 81 | } |
79 | _ => (), | ||
80 | } | 82 | } |
83 | m.complete(p, VISIBILITY); | ||
81 | } | 84 | } |
82 | vis.complete(p, VISIBILITY); | 85 | // test crate_keyword_vis |
86 | // crate fn main() { } | ||
87 | CRATE_KW => { | ||
88 | let m = p.start(); | ||
89 | p.bump(); | ||
90 | m.complete(p, VISIBILITY); | ||
91 | } | ||
92 | _ => (), | ||
83 | } | 93 | } |
84 | } | 94 | } |
85 | |||
86 | fn alias(p: &mut Parser) -> bool { | 95 | fn alias(p: &mut Parser) -> bool { |
87 | if p.at(AS_KW) { | 96 | if p.at(AS_KW) { |
88 | let alias = p.start(); | 97 | let alias = p.start(); |
diff --git a/tests/data/parser/inline/0099_crate_keyword_vis.rs b/tests/data/parser/inline/0099_crate_keyword_vis.rs new file mode 100644 index 000000000..660d927cf --- /dev/null +++ b/tests/data/parser/inline/0099_crate_keyword_vis.rs | |||
@@ -0,0 +1 @@ | |||
crate fn main() { } | |||
diff --git a/tests/data/parser/inline/0099_crate_keyword_vis.txt b/tests/data/parser/inline/0099_crate_keyword_vis.txt new file mode 100644 index 000000000..25e6d1759 --- /dev/null +++ b/tests/data/parser/inline/0099_crate_keyword_vis.txt | |||
@@ -0,0 +1,18 @@ | |||
1 | FILE@[0; 20) | ||
2 | FN_ITEM@[0; 19) | ||
3 | VISIBILITY@[0; 5) | ||
4 | CRATE_KW@[0; 5) | ||
5 | WHITESPACE@[5; 6) | ||
6 | FN_KW@[6; 8) | ||
7 | WHITESPACE@[8; 9) | ||
8 | NAME@[9; 13) | ||
9 | IDENT@[9; 13) "main" | ||
10 | PARAM_LIST@[13; 15) | ||
11 | L_PAREN@[13; 14) | ||
12 | R_PAREN@[14; 15) | ||
13 | WHITESPACE@[15; 16) | ||
14 | BLOCK_EXPR@[16; 19) | ||
15 | L_CURLY@[16; 17) | ||
16 | WHITESPACE@[17; 18) | ||
17 | R_CURLY@[18; 19) | ||
18 | WHITESPACE@[19; 20) | ||