bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

in which leading zeroes on tuple-struct accesses are abjured

Browse source 
Resolves #47073.
This commit is contained in:
Zack M. Davis 2017-12-30 21:16:16 -08:00
parent 54d7285a34
commit b0f880ddd9
3 changed files with 48 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/parse/parser.rs
View file

@ -2592,7 +2592,7 @@ impl<'a> Parser<'a> {
token::Ident(..) => {
e = self.parse_dot_suffix(e, lo)?;
}
token::Literal(token::Integer(n), suf) => {
token::Literal(token::Integer(index_ident), suf) => {
let sp = self.span;
// A tuple index may not have a suffix
@ -2602,16 +2602,25 @@ impl<'a> Parser<'a> {
hi = self.span;
self.bump();
let index = n.as_str().parse::<usize>().ok();
let invalid_msg = "invalid tuple or struct index";
let index = index_ident.as_str().parse::<usize>().ok();
match index {
Some(n) => {
if n.to_string() != index_ident.as_str() {
let mut err = self.struct_span_err(self.prev_span, invalid_msg);
err.span_suggestion(self.prev_span,
"try simplifying the index",
n.to_string());
err.emit();
}
let id = respan(dot_span.to(hi), n);
let field = self.mk_tup_field(e, id);
e = self.mk_expr(lo.to(hi), field, ThinVec::new());
}
None => {
let prev_span = self.prev_span;
self.span_err(prev_span, "invalid tuple or tuple struct index");
self.span_err(prev_span, invalid_msg);
}
}
}