Skip to content

Commit b61e5e4

Browse files
committed
---
yaml --- r: 30020 b: refs/heads/incoming c: 89bbaff h: refs/heads/master v: v3
1 parent 4a08661 commit b61e5e4

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 11b640d990220dc9386a300a10b2147d777d5452
9+
refs/heads/incoming: 89bbaff84fed6e6796c82f5a9fd200e693d47beb
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/parse/parser.rs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -990,15 +990,10 @@ struct parser {
990990
/* `!`, as an operator, is prefix, so we know this isn't that */
991991
if self.token == token::NOT {
992992
self.bump();
993-
let tts = match self.token {
994-
token::LPAREN | token::LBRACE | token::LBRACKET => {
995-
let ket = token::flip_delimiter(self.token);
996-
self.parse_unspanned_seq(copy self.token, ket,
997-
seq_sep_none(),
998-
|p| p.parse_token_tree())
999-
}
1000-
_ => self.fatal(~"expected open delimiter")
1001-
};
993+
let tts = self.parse_unspanned_seq(
994+
token::LPAREN, token::RPAREN, seq_sep_none(),
995+
|p| p.parse_token_tree());
996+
1002997
let hi = self.span.hi;
1003998

1004999
return pexpr(self.mk_mac_expr(
@@ -3254,15 +3249,9 @@ struct parser {
32543249
let pth = self.parse_path_without_tps();
32553250
self.expect(token::NOT);
32563251
let id = self.parse_ident();
3257-
let tts = match self.token {
3258-
token::LPAREN | token::LBRACE | token::LBRACKET => {
3259-
let ket = token::flip_delimiter(self.token);
3260-
self.parse_unspanned_seq(copy self.token, ket,
3261-
seq_sep_none(),
3262-
|p| p.parse_token_tree())
3263-
}
3264-
_ => self.fatal(~"expected open delimiter")
3265-
};
3252+
let tts = self.parse_unspanned_seq(
3253+
token::LPAREN, token::RPAREN, seq_sep_none(),
3254+
|p| p.parse_token_tree());
32663255
let m = ast::mac_invoc_tt(pth, tts);
32673256
let m: ast::mac = {node: m,
32683257
span: {lo: self.span.lo,

0 commit comments

Comments
 (0)