bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Turn interpolated_or_expr_span into a function

Browse source
This commit is contained in:
Florian Hahn 2016-01-27 10:47:33 +01:00
parent 9d8c64b996
commit 47bfd8c93c
1 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -233,23 +233,6 @@ macro_rules! maybe_whole {
) )
} }
/// Uses $parse_expr to parse an expression and returns the span of the interpolated
/// token or the span of the parsed expression, if it was not interpolated
macro_rules! interpolated_or_expr_span {
($p:expr, $parse_expr:expr) => {
{
let is_interpolated = $p.token.is_interpolated();
$parse_expr.map(|e| {
if is_interpolated {
($p.last_span, e)
} else {
(e.span, e)
}
})
}
}
}
fn maybe_append(mut lhs: Vec<Attribute>, rhs: Option<Vec<Attribute>>) fn maybe_append(mut lhs: Vec<Attribute>, rhs: Option<Vec<Attribute>>)
-> Vec<Attribute> { -> Vec<Attribute> {
if let Some(ref attrs) = rhs { if let Some(ref attrs) = rhs {
@ -558,6 +541,18 @@ impl<'a> Parser<'a> {
self.commit_stmt(&[edible], &[]) self.commit_stmt(&[edible], &[])
} }
/// returns the span of expr, if it was not interpolated or the span of the interpolated token
fn interpolated_or_expr_span(&self, expr: PResult<'a, P<Expr>>) -> PResult<'a, (Span, P<Expr>)> {
let is_interpolated = self.token.is_interpolated();
expr.map(|e| {
if is_interpolated {
(self.last_span, e)
} else {
(e.span, e)
}
})
}
pub fn parse_ident(&mut self) -> PResult<'a, ast::Ident> { pub fn parse_ident(&mut self) -> PResult<'a, ast::Ident> {
self.check_strict_keywords(); self.check_strict_keywords();
self.check_reserved_keywords(); self.check_reserved_keywords();
@ -2339,7 +2334,8 @@ impl<'a> Parser<'a> {
-> PResult<'a, P<Expr>> { -> PResult<'a, P<Expr>> {
let attrs = try!(self.parse_or_use_outer_attributes(already_parsed_attrs)); let attrs = try!(self.parse_or_use_outer_attributes(already_parsed_attrs));
let (span, b) = try!(interpolated_or_expr_span!(self, self.parse_bottom_expr())); let b = self.parse_bottom_expr();
let (span, b) = try!(self.interpolated_or_expr_span(b));
self.parse_dot_or_call_expr_with(b, span.lo, attrs) self.parse_dot_or_call_expr_with(b, span.lo, attrs)
} }
@ -2725,30 +2721,30 @@ impl<'a> Parser<'a> {
let ex = match self.token { let ex = match self.token {
token::Not => { token::Not => {
self.bump(); self.bump();
let (span, e) = try!(interpolated_or_expr_span!(self, let e = self.parse_prefix_expr(None);
self.parse_prefix_expr(None))); let (span, e) = try!(self.interpolated_or_expr_span(e));
hi = span.hi; hi = span.hi;
self.mk_unary(UnNot, e) self.mk_unary(UnNot, e)
} }
token::BinOp(token::Minus) => { token::BinOp(token::Minus) => {
self.bump(); self.bump();
let (span, e) = try!(interpolated_or_expr_span!(self, let e = self.parse_prefix_expr(None);
self.parse_prefix_expr(None))); let (span, e) = try!(self.interpolated_or_expr_span(e));
hi = span.hi; hi = span.hi;
self.mk_unary(UnNeg, e) self.mk_unary(UnNeg, e)
} }
token::BinOp(token::Star) => { token::BinOp(token::Star) => {
self.bump(); self.bump();
let (span, e) = try!(interpolated_or_expr_span!(self, let e = self.parse_prefix_expr(None);
self.parse_prefix_expr(None))); let (span, e) = try!(self.interpolated_or_expr_span(e));
hi = span.hi; hi = span.hi;
self.mk_unary(UnDeref, e) self.mk_unary(UnDeref, e)
} }
token::BinOp(token::And) | token::AndAnd => { token::BinOp(token::And) | token::AndAnd => {
try!(self.expect_and()); try!(self.expect_and());
let m = try!(self.parse_mutability()); let m = try!(self.parse_mutability());
let (span, e) = try!(interpolated_or_expr_span!(self, let e = self.parse_prefix_expr(None);
self.parse_prefix_expr(None))); let (span, e) = try!(self.interpolated_or_expr_span(e));
hi = span.hi; hi = span.hi;
ExprAddrOf(m, e) ExprAddrOf(m, e)
} }
@ -2767,8 +2763,8 @@ impl<'a> Parser<'a> {
} }
token::Ident(..) if self.token.is_keyword(keywords::Box) => { token::Ident(..) if self.token.is_keyword(keywords::Box) => {
self.bump(); self.bump();
let (span, e) = try!(interpolated_or_expr_span!(self, let e = self.parse_prefix_expr(None);
self.parse_prefix_expr(None))); let (span, e) = try!(self.interpolated_or_expr_span(e));
hi = span.hi; hi = span.hi;
ExprBox(e) ExprBox(e)
} }