mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove next_token handling from parse_expr_tuple_field_access.

Browse Source 
It's clearer at the call site.
This commit is contained in:
Nicholas Nethercote 2024-03-13 15:45:27 +11:00
parent 42066b029f
commit 90eeb3d681
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/rustc_parse/src/parser/expr.rs
View File

@ -1002,20 +1002,22 @@ pub fn parse_dot_suffix_expr(&mut self, lo: Span, base: P<Expr>) -> PResult<'a,
match self.token.uninterpolate().kind { match self.token.uninterpolate().kind {
token::Ident(..) => self.parse_dot_suffix(base, lo), token::Ident(..) => self.parse_dot_suffix(base, lo),
token::Literal(token::Lit { kind: token::Integer, symbol, suffix }) => { token::Literal(token::Lit { kind: token::Integer, symbol, suffix }) => {
Ok(self.parse_expr_tuple_field_access(lo, base, symbol, suffix, None)) self.bump();
Ok(self.parse_expr_tuple_field_access(lo, base, symbol, suffix))
} }
token::Literal(token::Lit { kind: token::Float, symbol, suffix }) => { token::Literal(token::Lit { kind: token::Float, symbol, suffix }) => {
Ok(match self.break_up_float(symbol, self.token.span) { Ok(match self.break_up_float(symbol, self.token.span) {
// 1e2 // 1e2
DestructuredFloat::Single(sym, _sp) => { DestructuredFloat::Single(sym, _sp) => {
self.parse_expr_tuple_field_access(lo, base, sym, suffix, None) self.bump();
self.parse_expr_tuple_field_access(lo, base, sym, suffix)
} }
// 1. // 1.
DestructuredFloat::TrailingDot(sym, ident_span, dot_span) => { DestructuredFloat::TrailingDot(sym, ident_span, dot_span) => {
assert!(suffix.is_none()); assert!(suffix.is_none());
self.token = Token::new(token::Ident(sym, IdentIsRaw::No), ident_span); self.token = Token::new(token::Ident(sym, IdentIsRaw::No), ident_span);
let next_token = (Token::new(token::Dot, dot_span), self.token_spacing); self.bump_with((Token::new(token::Dot, dot_span), self.token_spacing));
self.parse_expr_tuple_field_access(lo, base, sym, None, Some(next_token)) self.parse_expr_tuple_field_access(lo, base, sym, None)
} }
// 1.2 | 1.2e3 // 1.2 | 1.2e3
DestructuredFloat::MiddleDot( DestructuredFloat::MiddleDot(
@ -1028,18 +1030,13 @@ pub fn parse_dot_suffix_expr(&mut self, lo: Span, base: P<Expr>) -> PResult<'a,
self.token = Token::new(token::Ident(symbol1, IdentIsRaw::No), ident1_span); self.token = Token::new(token::Ident(symbol1, IdentIsRaw::No), ident1_span);
// This needs to be `Spacing::Alone` to prevent regressions. // This needs to be `Spacing::Alone` to prevent regressions.
// See issue #76399 and PR #76285 for more details // See issue #76399 and PR #76285 for more details
let next_token1 = (Token::new(token::Dot, dot_span), Spacing::Alone); self.bump_with((Token::new(token::Dot, dot_span), Spacing::Alone));
let base1 = self.parse_expr_tuple_field_access( let base1 = self.parse_expr_tuple_field_access(lo, base, symbol1, None);
lo,
base,
symbol1,
None,
Some(next_token1),
);
let next_token2 = let next_token2 =
Token::new(token::Ident(symbol2, IdentIsRaw::No), ident2_span); Token::new(token::Ident(symbol2, IdentIsRaw::No), ident2_span);
self.bump_with((next_token2, self.token_spacing)); // `.` self.bump_with((next_token2, self.token_spacing)); // `.`
self.parse_expr_tuple_field_access(lo, base1, symbol2, suffix, None) self.bump();
self.parse_expr_tuple_field_access(lo, base1, symbol2, suffix)
} }
DestructuredFloat::Error => base, DestructuredFloat::Error => base,
}) })
@ -1263,12 +1260,7 @@ fn parse_expr_tuple_field_access(
base: P<Expr>, base: P<Expr>,
field: Symbol, field: Symbol,
suffix: Option<Symbol>, suffix: Option<Symbol>,
next_token: Option<(Token, Spacing)>,
) -> P<Expr> { ) -> P<Expr> {
match next_token {
Some(next_token) => self.bump_with(next_token),
None => self.bump(),
}
let span = self.prev_token.span; let span = self.prev_token.span;
let field = ExprKind::Field(base, Ident::new(field, span)); let field = ExprKind::Field(base, Ident::new(field, span));
if let Some(suffix) = suffix { if let Some(suffix) = suffix {