user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract recover_field_access_by_float_lit

Browse source
This commit is contained in:
Mazdak Farrokhzad 2019-12-07 00:34:32 +01:00
parent a15d0cde57
commit ff5762b78a
1 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/librustc_parse/parser/expr.rs
View file

@ -711,33 +711,9 @@ impl<'a> Parser<'a> {
e = self.parse_tuple_field_access_expr(lo, e, symbol, suffix);
}
token::Literal(token::Lit { kind: token::Float, symbol, .. }) => {
self.bump();
let fstr = symbol.as_str();
let msg = format!("unexpected token: `{}`", symbol);
let mut err = self.diagnostic().struct_span_err(self.prev_span, &msg);
err.span_label(self.prev_span, "unexpected token");
if fstr.chars().all(|x| "0123456789.".contains(x)) {
let float = match fstr.parse::<f64>().ok() {
Some(f) => f,
None => continue,
};
let sugg = pprust::to_string(|s| {
s.popen();
s.print_expr(&e);
s.s.word(".");
s.print_usize(float.trunc() as usize);
s.pclose();
s.s.word(".");
s.s.word(fstr.splitn(2, ".").last().unwrap().to_string())
});
err.span_suggestion(
lo.to(self.prev_span),
"try parenthesizing the first index",
sugg,
Applicability::MachineApplicable,
);
if let Some(err) = self.recover_field_access_by_float_lit(lo, &e, symbol) {
err?
}
return Err(err);
}
_ => {
// FIXME Could factor this out into non_fatal_unexpected or something.
@ -759,6 +735,41 @@ impl<'a> Parser<'a> {
return Ok(e);
}
fn recover_field_access_by_float_lit(
&mut self,
lo: Span,
base: &P<Expr>,
sym: Symbol,
) -> Option<PResult<'a, ()>> {
self.bump();
let fstr = sym.as_str();
let msg = format!("unexpected token: `{}`", sym);
let mut err = self.struct_span_err(self.prev_span, &msg);
err.span_label(self.prev_span, "unexpected token");
if fstr.chars().all(|x| "0123456789.".contains(x)) {
let float = fstr.parse::<f64>().ok()?;
let sugg = pprust::to_string(|s| {
s.popen();
s.print_expr(&base);
s.s.word(".");
s.print_usize(float.trunc() as usize);
s.pclose();
s.s.word(".");
s.s.word(fstr.splitn(2, ".").last().unwrap().to_string())
});
err.span_suggestion(
lo.to(self.prev_span),
"try parenthesizing the first index",
sugg,
Applicability::MachineApplicable,
);
}
Some(Err(err))
}
fn parse_tuple_field_access_expr(
&mut self,
lo: Span,