Skip to content

Assign proper span to range expression #27203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2015
Merged

Assign proper span to range expression #27203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/libsyntax/parse/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,14 +2738,15 @@ impl<'a> Parser<'a> {
// (much lower than other prefix expressions) to be consistent
// with the postfix-form 'expr..'
let lo = self.span.lo;
let mut hi = self.span.hi;
try!(self.bump());
let opt_end = if self.is_at_start_of_range_notation_rhs() {
let end = try!(self.parse_binops());
hi = end.span.hi;
Some(end)
} else {
None
};
let hi = self.span.hi;
let ex = self.mk_range(None, opt_end);
Ok(self.mk_expr(lo, hi, ex))
}
Expand Down Expand Up @@ -2787,17 +2788,17 @@ impl<'a> Parser<'a> {
}
// A range expression, either `expr..expr` or `expr..`.
token::DotDot => {
let lo = lhs.span.lo;
let mut hi = self.span.hi;
try!(self.bump());

let opt_end = if self.is_at_start_of_range_notation_rhs() {
let end = try!(self.parse_binops());
hi = end.span.hi;
Some(end)
} else {
None
};

let lo = lhs.span.lo;
let hi = self.span.hi;
let range = self.mk_range(Some(lhs), opt_end);
return Ok(self.mk_expr(lo, hi, range));
}
Expand Down