Skip to content

Commit f7960ac

Browse files
committed
Revert "m1!{...} is now forbidden. Use m1!(...) instead."
This reverts commit 89bbaff.
1 parent 4e1ce01 commit f7960ac

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,10 +1082,15 @@ impl Parser {
10821082
/* `!`, as an operator, is prefix, so we know this isn't that */
10831083
if self.token == token::NOT {
10841084
self.bump();
1085-
let tts = self.parse_unspanned_seq(
1086-
token::LPAREN, token::RPAREN, seq_sep_none(),
1087-
|p| p.parse_token_tree());
1088-
1085+
let tts = match self.token {
1086+
token::LPAREN | token::LBRACE | token::LBRACKET => {
1087+
let ket = token::flip_delimiter(self.token);
1088+
self.parse_unspanned_seq(copy self.token, ket,
1089+
seq_sep_none(),
1090+
|p| p.parse_token_tree())
1091+
}
1092+
_ => self.fatal(~"expected open delimiter")
1093+
};
10891094
let hi = self.span.hi;
10901095
10911096
return self.mk_mac_expr(
@@ -3412,9 +3417,15 @@ impl Parser {
34123417
let pth = self.parse_path_without_tps();
34133418
self.expect(token::NOT);
34143419
let id = self.parse_ident();
3415-
let tts = self.parse_unspanned_seq(
3416-
token::LPAREN, token::RPAREN, seq_sep_none(),
3417-
|p| p.parse_token_tree());
3420+
let tts = match self.token {
3421+
token::LPAREN | token::LBRACE | token::LBRACKET => {
3422+
let ket = token::flip_delimiter(self.token);
3423+
self.parse_unspanned_seq(copy self.token, ket,
3424+
seq_sep_none(),
3425+
|p| p.parse_token_tree())
3426+
}
3427+
_ => self.fatal(~"expected open delimiter")
3428+
};
34183429
let m = ast::mac_invoc_tt(pth, tts);
34193430
let m: ast::mac = {node: m,
34203431
span: {lo: self.span.lo,

0 commit comments

Comments
 (0)