@@ -1184,15 +1184,7 @@ impl Parser {
1184
1184
pub fn is_named_argument ( & self ) -> bool {
1185
1185
let offset = match * self . token {
1186
1186
token:: BINOP ( token:: AND ) => 1 ,
1187
- token:: BINOP ( token:: MINUS ) => 1 ,
1188
1187
token:: ANDAND => 1 ,
1189
- token:: BINOP ( token:: PLUS ) => {
1190
- if self . look_ahead ( 1 , |t| * t == token:: BINOP ( token:: PLUS ) ) {
1191
- 2
1192
- } else {
1193
- 1
1194
- }
1195
- } ,
1196
1188
_ if token:: is_keyword ( keywords:: Mut , self . token ) => 1 ,
1197
1189
_ => 0
1198
1190
} ;
@@ -1802,7 +1794,7 @@ impl Parser {
1802
1794
return self . mk_mac_expr ( lo, hi, mac_invoc_tt ( pth, tts, EMPTY_CTXT ) ) ;
1803
1795
} else if * self . token == token:: LBRACE {
1804
1796
// This might be a struct literal.
1805
- if self . looking_at_record_literal ( ) {
1797
+ if self . looking_at_struct_literal ( ) {
1806
1798
// It's a struct literal.
1807
1799
self . bump ( ) ;
1808
1800
let mut fields = ~[ ] ;
@@ -2513,12 +2505,11 @@ impl Parser {
2513
2505
}
2514
2506
}
2515
2507
2516
- // For distingishing between record literals and blocks
2517
- fn looking_at_record_literal ( & self ) -> bool {
2508
+ // For distingishing between struct literals and blocks
2509
+ fn looking_at_struct_literal ( & self ) -> bool {
2518
2510
* self . token == token:: LBRACE &&
2519
- ( self . look_ahead ( 1 , |t| token:: is_keyword ( keywords:: Mut , t) ) ||
2520
- ( self . look_ahead ( 1 , |t| token:: is_plain_ident ( t) ) &&
2521
- self . look_ahead ( 2 , |t| * t == token:: COLON ) ) )
2511
+ ( self . look_ahead ( 1 , |t| token:: is_plain_ident ( t) ) &&
2512
+ self . look_ahead ( 2 , |t| * t == token:: COLON ) )
2522
2513
}
2523
2514
2524
2515
fn parse_match_expr ( & self ) -> @Expr {
0 commit comments