aboutsummaryrefslogtreecommitdiff
path: root/src/parser/event_parser/grammar/mod.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/parser/event_parser/grammar/mod.rs')
-rw-r--r--src/parser/event_parser/grammar/mod.rs28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/parser/event_parser/grammar/mod.rs b/src/parser/event_parser/grammar/mod.rs
index b87f3ca8a..931193b5f 100644
--- a/src/parser/event_parser/grammar/mod.rs
+++ b/src/parser/event_parser/grammar/mod.rs
@@ -20,7 +20,7 @@ fn visibility(p: &mut Parser) {
20 let vis = p.start(); 20 let vis = p.start();
21 p.bump(); 21 p.bump();
22 if p.at(L_PAREN) { 22 if p.at(L_PAREN) {
23 match p.raw_lookahead(1) { 23 match p.nth(1) {
24 CRATE_KW | SELF_KW | SUPER_KW | IN_KW => { 24 CRATE_KW | SELF_KW | SUPER_KW | IN_KW => {
25 p.bump(); 25 p.bump();
26 if p.bump() == IN_KW { 26 if p.bump() == IN_KW {
@@ -57,7 +57,7 @@ impl<'p> Parser<'p> {
57 err.complete(self, ERROR); 57 err.complete(self, ERROR);
58 } 58 }
59 59
60 pub(crate) fn expect(&mut self, kind: SyntaxKind) -> bool { 60 fn expect(&mut self, kind: SyntaxKind) -> bool {
61 if self.at(kind) { 61 if self.at(kind) {
62 self.bump(); 62 self.bump();
63 true 63 true
@@ -77,39 +77,23 @@ impl<'p> Parser<'p> {
77 77
78trait Lookahead: Copy { 78trait Lookahead: Copy {
79 fn is_ahead(self, p: &Parser) -> bool; 79 fn is_ahead(self, p: &Parser) -> bool;
80 fn consume(p: &mut Parser);
81} 80}
82 81
83impl Lookahead for SyntaxKind { 82impl Lookahead for SyntaxKind {
84 fn is_ahead(self, p: &Parser) -> bool { 83 fn is_ahead(self, p: &Parser) -> bool {
85 p.current() == self 84 p.current() == self
86 } 85 }
87
88 fn consume(p: &mut Parser) {
89 p.bump();
90 }
91} 86}
92 87
93impl Lookahead for [SyntaxKind; 2] { 88impl Lookahead for [SyntaxKind; 2] {
94 fn is_ahead(self, p: &Parser) -> bool { 89 fn is_ahead(self, p: &Parser) -> bool {
95 p.current() == self[0] && p.raw_lookahead(1) == self[1] 90 p.current() == self[0] && p.nth(1) == self[1]
96 }
97
98 fn consume(p: &mut Parser) {
99 p.bump();
100 p.bump();
101 } 91 }
102} 92}
103 93
104impl Lookahead for [SyntaxKind; 3] { 94impl Lookahead for [SyntaxKind; 3] {
105 fn is_ahead(self, p: &Parser) -> bool { 95 fn is_ahead(self, p: &Parser) -> bool {
106 p.current() == self[0] && p.raw_lookahead(1) == self[1] && p.raw_lookahead(2) == self[2] 96 p.current() == self[0] && p.nth(1) == self[1] && p.nth(2) == self[2]
107 }
108
109 fn consume(p: &mut Parser) {
110 p.bump();
111 p.bump();
112 p.bump();
113 } 97 }
114} 98}
115 99
@@ -121,8 +105,4 @@ impl<'a> Lookahead for AnyOf<'a> {
121 let curr = p.current(); 105 let curr = p.current();
122 self.0.iter().any(|&k| k == curr) 106 self.0.iter().any(|&k| k == curr)
123 } 107 }
124
125 fn consume(p: &mut Parser) {
126 p.bump();
127 }
128} 108}