bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tweak some parser check/eat methods.

Browse source 
The most significant is `check_keyword`: it now only pushes to
`expected_token_types` if the keyword check fails, which matches how all
the other `check` methods work.

The remainder are just tweaks to make these methods more consistent with
each other.
This commit is contained in:
Nicholas Nethercote 2024-12-04 15:36:49 +11:00
parent 48f7714819
commit fb5ba8a6d4
1 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
compiler/rustc_parse/src/parser/mod.rs
View file

@ -666,19 +666,20 @@ impl<'a> Parser<'a> {
#[inline] #[inline]
#[must_use] #[must_use]
fn check_keyword(&mut self, kw: Symbol) -> bool { fn check_keyword(&mut self, kw: Symbol) -> bool {
self.expected_token_types.push(TokenType::Keyword(kw)); let is_keyword = self.token.is_keyword(kw);
self.token.is_keyword(kw) if !is_keyword {
self.expected_token_types.push(TokenType::Keyword(kw));
}
is_keyword
} }
#[inline] #[inline]
#[must_use] #[must_use]
fn check_keyword_case(&mut self, kw: Symbol, case: Case) -> bool { fn check_keyword_case(&mut self, kw: Symbol, case: Case) -> bool {
if self.check_keyword(kw) { if self.check_keyword(kw) {
return true; true
}
// Do an ASCII case-insensitive match, because all keywords are ASCII. // Do an ASCII case-insensitive match, because all keywords are ASCII.
if case == Case::Insensitive } else if case == Case::Insensitive
&& let Some((ident, IdentIsRaw::No)) = self.token.ident() && let Some((ident, IdentIsRaw::No)) = self.token.ident()
&& ident.as_str().eq_ignore_ascii_case(kw.as_str()) && ident.as_str().eq_ignore_ascii_case(kw.as_str())
{ {
@ -694,12 +695,11 @@ impl<'a> Parser<'a> {
#[inline] #[inline]
#[must_use] #[must_use]
pub fn eat_keyword(&mut self, kw: Symbol) -> bool { pub fn eat_keyword(&mut self, kw: Symbol) -> bool {
if self.check_keyword(kw) { let is_keyword = self.check_keyword(kw);
if is_keyword {
self.bump(); self.bump();
true
} else {
false
} }
is_keyword
} }
/// Eats a keyword, optionally ignoring the case. /// Eats a keyword, optionally ignoring the case.
@ -709,19 +709,17 @@ impl<'a> Parser<'a> {
#[must_use] #[must_use]
fn eat_keyword_case(&mut self, kw: Symbol, case: Case) -> bool { fn eat_keyword_case(&mut self, kw: Symbol, case: Case) -> bool {
if self.eat_keyword(kw) { if self.eat_keyword(kw) {
return true; true
} } else if case == Case::Insensitive
if case == Case::Insensitive
&& let Some((ident, IdentIsRaw::No)) = self.token.ident() && let Some((ident, IdentIsRaw::No)) = self.token.ident()
&& ident.as_str().to_lowercase() == kw.as_str().to_lowercase() && ident.as_str().to_lowercase() == kw.as_str().to_lowercase()
{ {
self.dcx().emit_err(errors::KwBadCase { span: ident.span, kw: kw.as_str() }); self.dcx().emit_err(errors::KwBadCase { span: ident.span, kw: kw.as_str() });
self.bump(); self.bump();
return true; true
} else {
false
} }
false
} }
/// If the next token is the given keyword, eats it and returns `true`. /// If the next token is the given keyword, eats it and returns `true`.
@ -730,12 +728,11 @@ impl<'a> Parser<'a> {
#[inline] #[inline]
#[must_use] #[must_use]
pub fn eat_keyword_noexpect(&mut self, kw: Symbol) -> bool { pub fn eat_keyword_noexpect(&mut self, kw: Symbol) -> bool {
if self.token.is_keyword(kw) { let is_keyword = self.token.is_keyword(kw);
if is_keyword {
self.bump(); self.bump();
true
} else {
false
} }
is_keyword
} }
/// If the given word is not a keyword, signals an error. /// If the given word is not a keyword, signals an error.
@ -752,12 +749,10 @@ impl<'a> Parser<'a> {
#[inline] #[inline]
fn check_or_expected(&mut self, ok: bool, typ: TokenType) -> bool { fn check_or_expected(&mut self, ok: bool, typ: TokenType) -> bool {
if ok { if !ok {
true
} else {
self.expected_token_types.push(typ); self.expected_token_types.push(typ);
false
} }
ok
} }
fn check_ident(&mut self) -> bool { fn check_ident(&mut self) -> bool {