bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #39335 - cramertj:cramertj/can_begin_expr_fix, r=petrochenkov

Browse source 
Fix can_begin_expr keyword behavior

Partial fix for #28784.
This commit is contained in:
Alex Crichton 2017-01-27 14:41:24 -08:00
commit 915242af7a
2 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libsyntax/parse/token.rs
View file

@ -80,6 +80,28 @@ impl Lit {
}
}
fn ident_can_begin_expr(ident: ast::Ident) -> bool {
let ident_token: Token = Ident(ident);
!ident_token.is_any_keyword() ||
ident_token.is_path_segment_keyword() ||
[
keywords::Box.name(),
keywords::Break.name(),
keywords::Continue.name(),
keywords::False.name(),
keywords::For.name(),
keywords::If.name(),
keywords::Loop.name(),
keywords::Match.name(),
keywords::Move.name(),
keywords::Return.name(),
keywords::True.name(),
keywords::Unsafe.name(),
keywords::While.name(),
].contains(&ident.name)
}
#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Hash, Debug)]
pub enum Token {
/* Expression-operator symbols. */
@ -163,7 +185,7 @@ impl Token {
pub fn can_begin_expr(&self) -> bool {
match *self {
OpenDelim(..) => true,
Ident(..) => true,
Ident(ident) => ident_can_begin_expr(ident),
Literal(..) => true,
Not => true,
BinOp(Minus) => true,